fix failing tests
fix for GRAILS-2730 "Location of stacktrace.log in WAR deployed app on Tomcat 6 running non-root is invalid"
Merge branch '2.1.x' into 2.2.x
Merge branch '2.2.x'