Merged 8252


git-svn-id: http://svn.terracotta.org/svn/ehcache@8253 b9324663-ca0f-0410-8574-be9b3887307d
merge 8247 for mnk-5603

git-svn-id: http://svn.terracotta.org/svn/ehcache@8254 b9324663-ca0f-0410-8574-be9b3887307d
merge 8245 for MNK-5589

git-svn-id: http://svn.terracotta.org/svn/ehcache@8255 b9324663-ca0f-0410-8574-be9b3887307d
merge 8247 for mnk-5603

git-svn-id: http://svn.terracotta.org/svn/ehcache@8256 b9324663-ca0f-0410-8574-be9b3887307d
merge 8245 for MNK-5589

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