oapi-codegen complains of a discriminator being set when merging allOf schemas #896

The checks in mergeOpenapiSchemas complain if a discriminator is set for any of the schemas being merged. It seems that this should be allowed when merging allOfs (eg. an allOf that contains a one/anyOf with a discriminator). Currently mergeOpenapiSchemas is only called for allOf schemas.