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
Merge branch 'master' into pull-requests