fix tests to not care about jaxb ordering for attributes http://bamboo.internal.opennms.com:8085/browse/OPENNMS-MASTER17-TEST-5/
Merge branch '1.12'