Fixed proxy test.
Increase external proxy test timeout.
Merged branch 'jetty-7' into 'jetty-8'.
Merged branch 'jetty-8' into 'master'.
Merged branch 'master' into 'jetty-9.1'.