ENG-891 merge rev 8619 from trunk

git-svn-id: http://svn.terracotta.org/svn/ehcache@8676 b9324663-ca0f-0410-8574-be9b3887307d
ENG-891 merge rev 8619 from trunk

git-svn-id: http://svn.terracotta.org/svn/ehcache@8677 b9324663-ca0f-0410-8574-be9b3887307d
Minor tests clean up following non reproducible monkey failure

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