HHH-6457 Correct infinispan and ehcache test failures