MNK-5954 :  CacheManagerSamplerImplTest failed with unexpected exception 
* making checkstyle happy (javadoc even for package protected methods)

git-svn-id: http://svn.terracotta.org/svn/ehcache@8589 b9324663-ca0f-0410-8574-be9b3887307d
MNK-5954 : merge from trunk

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


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


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