https://github.com/hibernate/hibernate-orm/pull/1604
partial backports of HHH-10904 Closed and HHH-10907 Closed
backport of #1538
few other test fixes

I'll send another PR to master with fixes for ListAddTest and UniqueConstraintGenerationTest