Fixed NMS-5904

Fixed a typo!
Merge branch 'master' of github.com:OpenNMS/opennms
 Fixed NMS-5904

Fixed a typo!
Merge branch '1.12'
fix formatting
Merge branch 'master' of git://github.com/OpenNMS/opennms
JUNIPER-ONLY: Change some UI by PLM requirement