MNK-5599 Merged r6019 from trunk, see DEV-7774

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