CAS-1269: Upgrade to the latest ehcache module, 2.7