Rev 23426 merged from trunk.

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

git-svn-id: http://svn.terracotta.org/svn/ehcache@7882 b9324663-ca0f-0410-8574-be9b3887307d
ENG-177 fix handling of * select token, add back in parseable/unparseable tests in ParseModelTests.

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