ENG-88 Merge of 7833 and 7834. 


git-svn-id: http://svn.terracotta.org/svn/ehcache@7837 b9324663-ca0f-0410-8574-be9b3887307d
ENG-88 merge of r7833 and r7834


git-svn-id: http://svn.terracotta.org/svn/ehcache@7838 b9324663-ca0f-0410-8574-be9b3887307d
ENG-88 Merge of r7833 and r7834.


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