Fix for enhancement NMS-5884
Merge remote-tracking branch 'origin/1.10' into 1.12
Merge branch '1.12' of github.com:OpenNMS/opennms into 1.12