Faster jetty shutdown. Faster build.
Merge branch 'master' into solution