Fix NMS-5886: Distributed map popup unknown map implementation on new install
Work around JAXB/JDK7 issue http://bamboo.internal.opennms.com:8085/browse/OPENNMS-MASTER17-TEST-89
Merge branch '1.12'