Merge branch 'ralf0131-graceful-shutdown-in-tomcat'