uber-bundle
Merge remote-tracking branch 'origin/master'

Conflicts:
	container-resources/bundles/opennms-protocols/pom.xml
poller with thresd.