ENG-432

git-svn-id: http://svn.terracotta.org/svn/ehcache@8455 b9324663-ca0f-0410-8574-be9b3887307d
ENG-578

git-svn-id: http://svn.terracotta.org/svn/ehcache@8456 b9324663-ca0f-0410-8574-be9b3887307d
ENG-578:Reverting this change

git-svn-id: http://svn.terracotta.org/svn/ehcache@8457 b9324663-ca0f-0410-8574-be9b3887307d