CRQ-302 Merged r8745 from trunk

git-svn-id: http://svn.terracotta.org/svn/ehcache@8746 b9324663-ca0f-0410-8574-be9b3887307d
CRQ-302 Merged r8745 from trunk

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