Fix NMS-6601 New jetty.xml configuration lacks default keystore passwords
backport OSGi bridge fixes to 1.12
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	container/servlet/src/main/java/org/opennms/container/web/OnmsOSGiBridgeActivator.java