CAS-1096: Reset the ehcache configuration back to master, (left-over commit from incorrect branching)