Fixed merge error.
400312 ServletContextListener.contextInitialized() is not called when added in ServletContainerInitializer.onStartup
Merge remote-tracking branch 'origin/jetty-8'

Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletContainerInitializerListener.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java