REF Update ehcache
Merge