mnk-5548 fix

git-svn-id: http://svn.terracotta.org/svn/ehcache@8141 b9324663-ca0f-0410-8574-be9b3887307d
mnk-5548, merge 8141 in 4.0.x

git-svn-id: http://svn.terracotta.org/svn/ehcache@8142 b9324663-ca0f-0410-8574-be9b3887307d
mnk-5548, merge 8141 in 4.1.x

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