Properly merge discriminator when combining schema's using allOf

[alexbakker]

Previously, when combining two schema's using allOf, the discriminator would not carry over to the resulting merged schema.