Fixed NMS-5904

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

Fixed a typo!
Merge branch '1.12'
Merge branch 'master' into pull-requests