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'