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
Merge branch '1.12'
Fix NMS-5894: add a call to getNodeType() before comparing names
no idea why these particular things want old jaxb/stax/etc. but I cannot seem to make them work with modern jaxb
Merge remote-tracking branch 'origin/1.10' into 1.12
Merge branch '1.12'

Conflicts:
	opennms-services/src/main/java/org/opennms/netmgt/poller/monitors/SmbMonitor.java
fix jaxb ordering test
fix for more test failures related to JDK issues
Merge branch '1.12'

Conflicts:
	features/ncs/ncs-model/src/test/java/org/opennms/netmgt/model/ncs/JAXBTest.java
compile fixes
Merge branch '1.12'
Comment out a rogue println in webapp/admin/sendevent.jsp