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
Merge branch '1.12'

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