merge 7661 from trunk : CacheWriterTest fixes

git-svn-id: http://svn.terracotta.org/svn/ehcache@8176 b9324663-ca0f-0410-8574-be9b3887307d
Merged 8145 from trunk (CRQ-129)


git-svn-id: http://svn.terracotta.org/svn/ehcache@8177 b9324663-ca0f-0410-8574-be9b3887307d
Merged 8165 and 8175


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