TABINF-3883 merge rev 9025 from branches/ehcache-2.8.x

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