ENG-276 and other aggregator-related fixes.


git-svn-id: http://svn.terracotta.org/svn/ehcache@8313 b9324663-ca0f-0410-8574-be9b3887307d
Fixed minor logic error.

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