PE-1562 - Upgrade ehcache 2.5.0 -> 2.5.4