Fixing various javadoc errors
Fixing various javadoc errors
Removing scope test
Merge branch 'master' into jetty-9.1

Conflicts:
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiMapTest.java
417152 - WebSocket / Do all setup in websocket specific ServletContainerInitializer

+ removing etc/jetty-websockets.xml (now irrelevant)