expanded tabs in indents
Merge remote-tracking branch 'origin/master' into jetty-http2

Conflicts:
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java
expanded tabs in indents
fixed merge syntax errors