Fix for tomcat 8
Merge branch 'master' into deploy/webkaart-test