fix logic for merging object schemas within a property

[eli-bl]

Fixes #1123.

Details are as described in the changeset.

This is a breaking change only in cases where the previous logic was producing an unambiguously wrong result. That is, in the example shown in the changeset, any code that had previously relied on ModelB.result being an instance of BaseResult rather than ExtendedResult would now fail.