TABQA-3331 Merge rev 8852 from trunk

git-svn-id: http://svn.terracotta.org/svn/ehcache@8858 b9324663-ca0f-0410-8574-be9b3887307d
TABQA-3331 Merge rev 8858 from branches/ehcache-2.8.x

git-svn-id: http://svn.terracotta.org/svn/ehcache@8859 b9324663-ca0f-0410-8574-be9b3887307d
TABQA-7331 Add missing import statement

git-svn-id: http://svn.terracotta.org/svn/ehcache@8860 b9324663-ca0f-0410-8574-be9b3887307d
TABQA-7331 Add missing import statement

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