HHH-8732 Upgraded Ehcache to 2.7.5
HHH-8732 minor test fix