Always interrupt the jetty thread on stop

Alternative solution to #680 that avoids a stuck Jetty thread (could even combine these if necessary)