REVIEW: always interrupt the jetty thread on stop

Alternative solution to #680 that avoids a stuck Jetty thread (could even combine these if necessary)

http://bamboo.s/browse/NX-OSSF215-1 :white_check_mark: