420048 - DefaultServlet alias checks configured resourceBase

Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
Merge remote-tracking branch 'origin/master' into jetty-9.1