Misc: don't commit no-ops
Bugfix: on some systems, Jetty may fail to restart during tests