432483 make osgi.serviceloader support for javax.servlet.ServletContainerInitializer optional
(cherry picked from commit 31043d25708edbea9ef31948093f4eaf2247919b)

Conflicts:
	jetty-annotations/pom.xml