TABQA-7262 : merge 8870 from trunk

git-svn-id: http://svn.terracotta.org/svn/ehcache@8923 b9324663-ca0f-0410-8574-be9b3887307d
TABQA-7262 : merge 8870 from trunk (missed parent dir)

git-svn-id: http://svn.terracotta.org/svn/ehcache@8924 b9324663-ca0f-0410-8574-be9b3887307d
TABQA-7262 : merge 8870 from trunk

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