Fix for mnk-5482

git-svn-id: http://svn.terracotta.org/svn/ehcache@8007 b9324663-ca0f-0410-8574-be9b3887307d
Merging r8007 from trunk

git-svn-id: http://svn.terracotta.org/svn/ehcache@8008 b9324663-ca0f-0410-8574-be9b3887307d
Mnk5482: Merging r8007 from trunk

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