plugins: Fix code generation for a conflicting oneof#639

sigaev wants to merge 1 commit intogogo:mastergogo/protobuf:masterfrom

sigaev:fix-oneofsigaev/protobuf:fix-oneofCopy head branch name to clipboard