improve handling of discriminators

[sserrata]

Description

Long overdue improvements to how discriminator schemas are handled.

Important notes:

• In the event that the discriminator property is defined at both the parent and sub schema levels, the plugin will attempt to merge the sub schema property into the parent