TAB-4778 : merge 9099 from trunk

git-svn-id: http://svn.terracotta.org/svn/ehcache@9128 b9324663-ca0f-0410-8574-be9b3887307d
TAB-4778 : merge 9128 from 2.8.x

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