TABINF-3920: cleanup 4.2.0-rc branches

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