NMS-5889 fix system-report running
Merge branch '1.12'
Revert "Work around JAXB/JDK7 issue http://bamboo.internal.opennms.com:8085/browse/OPENNMS-MASTER17-TEST-89"

This reverts commit a72a63caecf77a30f742fa2fd0567184dd945ddb.
Merge branch '1.12'
Reinstate JAXB deps to work around JDK bugs.

Revert "NMS-5482 remove unnecessary JAXB dependencies"

This reverts commit 7c8fe95d64ec14fda1b771841e049c12f04753c4.

Conflicts:
	integrations/opennms-link-provisioning-adapter/pom.xml
	opennms-base-assembly/pom.xml
reinstate JAXB dependencies, using servicemix version instead
remove springsource jaxb references
Reinstate JAXB deps to work around JDK bugs.

Revert "NMS-5482 remove unnecessary JAXB dependencies"

This reverts commit 7c8fe95d64ec14fda1b771841e049c12f04753c4.

Conflicts:
	integrations/opennms-link-provisioning-adapter/pom.xml
	opennms-base-assembly/pom.xml
reinstate JAXB dependencies, using servicemix version instead
updates/fixes to deal with merge of JAXB changes from 1.12
Merge branch '1.12'

Conflicts:
	dependencies/jaxb/pom.xml
	features/ncs/ncs-model/pom.xml
	features/opennms-jmx-tools/pom.xml
	opennms-base-assembly/src/assembly/daemon.xml
Fix of #SPC-375.
Fix for Bug NMS-5892
Merge remote-tracking branch 'origin/1.10' into 1.12
Fix for Enhancement NMS-5893
Merge remote-tracking branch 'origin/1.10' into 1.12
make it clearer which XML goes where in assertXmlEquals
fix test to not care about attribute ordering
make scope test
Merge branch '1.12'

Conflicts:
	opennms-alarms/http-northbounder/pom.xml