HHH-7490 : Misc bugfixes and added @FailureExpectedWithNewMetamodel to failing tests