Revert hhh 8908 4.3

Adam/Lukasz,

There are 2 commits. The first reverts the fix from HHH-8908; the second attempts to change to the assertions to be consistent with expected default audit behavior for mapped-superclasses.

Please take a look at the comments in the second commit and let me know what should be changed.

Thanks,
Gail