JUNIPER-ONLY: change the monitoring-localtions.xml formart to avoid conflict during upgrade
Merge branch 'space-14.1' of github.com:JunosSpace/opennms into space-14.1