TABQA-7401 : relying on latest versions - merged from trunk

git-svn-id: http://svn.terracotta.org/svn/ehcache@9173 b9324663-ca0f-0410-8574-be9b3887307d
TABQA-7401 : relying on latest versions - merged from trunk

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