ENG-185 : Fixed compilation error

git-svn-id: http://svn.terracotta.org/svn/ehcache@7916 b9324663-ca0f-0410-8574-be9b3887307d
committing compilation error

git-svn-id: http://svn.terracotta.org/svn/ehcache@7917 b9324663-ca0f-0410-8574-be9b3887307d
ENG-185 Fix invalid merge

git-svn-id: http://svn.terracotta.org/svn/ehcache@7918 b9324663-ca0f-0410-8574-be9b3887307d
ENG-185 Fix invalid merge

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