improved javadoc
Adding overall test timeout
Merge branch 'jetty-9.2.x'
Adding test tracking to figure out where the test hang is coming from