resolve oneof field name conflicts with imported packages#1912

ae0n wants to merge 1 commit intoscalapb:masterscalapb/ScalaPB:masterfrom

ae0n:fix-incorrect-import-generation-for-oneofae0n/ScalaPB:fix-incorrect-import-generation-for-oneofCopy head branch name to clipboard