EHC-1079 Merge from trunk: c9063,9063,9088

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