ENG-403: Fixed test case

git-svn-id: http://svn.terracotta.org/svn/ehcache@8395 b9324663-ca0f-0410-8574-be9b3887307d
Revert "fixing check short for lifecycle branch"

git-svn-id: http://svn.terracotta.org/svn/ehcache@8396 b9324663-ca0f-0410-8574-be9b3887307d
merge from trunk up to r8396

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

git-svn-id: http://svn.terracotta.org/svn/ehcache@8398 b9324663-ca0f-0410-8574-be9b3887307d
EHC-1060:  exclude on-heap size in bytes stats samples when a cache is configured count-based

git-svn-id: http://svn.terracotta.org/svn/ehcache@8399 b9324663-ca0f-0410-8574-be9b3887307d
EHC-1060: backport fix from trunk

git-svn-id: http://svn.terracotta.org/svn/ehcache@8400 b9324663-ca0f-0410-8574-be9b3887307d
fix for ENG-585

git-svn-id: http://svn.terracotta.org/svn/ehcache@8401 b9324663-ca0f-0410-8574-be9b3887307d
merge:8401 fix for ENG-585

git-svn-id: http://svn.terracotta.org/svn/ehcache@8402 b9324663-ca0f-0410-8574-be9b3887307d
merge:8401 fix for ENG-585

git-svn-id: http://svn.terracotta.org/svn/ehcache@8403 b9324663-ca0f-0410-8574-be9b3887307d
ENG-591 Change lock mechanism for marking cache in use and un-marking when disposing

git-svn-id: http://svn.terracotta.org/svn/ehcache@8404 b9324663-ca0f-0410-8574-be9b3887307d
ENG-423: nonstop does not interrupt cache disposal anymore

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