MNK-5465 Merged r7969 from trunk

git-svn-id: http://svn.terracotta.org/svn/ehcache@7970 b9324663-ca0f-0410-8574-be9b3887307d
MNK-5465 Merged r7969 from trunk

git-svn-id: http://svn.terracotta.org/svn/ehcache@7971 b9324663-ca0f-0410-8574-be9b3887307d
MNK-5416 Merged r7956 & r7957 from trunk

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