ENG-882: Merged r8564


git-svn-id: http://svn.terracotta.org/svn/ehcache@8816 b9324663-ca0f-0410-8574-be9b3887307d
ENG-882: Merged r8816


git-svn-id: http://svn.terracotta.org/svn/ehcache@8817 b9324663-ca0f-0410-8574-be9b3887307d
Mnk6104 merging fix from trunk r8813

git-svn-id: http://svn.terracotta.org/svn/ehcache@8818 b9324663-ca0f-0410-8574-be9b3887307d
Mnk6104 merging fix from trunk r8813

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