Fix CookieTokenStoreAdapterTest sometimes failing
Fix location of Tomcat6 home to be inside target
Merge pull request #865 from mposolda/master

Minor fixes in testsuite