Fix allOf with $ref to discriminator-less oneOf flattening all variant properties

Fix allOf with $ref to discriminator-less oneOf flattening all variant properties #3579