Pushed https://github.com/scottmarlow/hibernate-orm/tree/HHH-13433_master + https://github.com/scottmarlow/hibernate-orm/tree/HHH-13433_53.

I didn't add any tests for this case yet, but did verify that the code change on these branches didn't seem to cause any (additional) tests to fail.