Fix for enhancement NMS-5876
Merge branch '1.10' of github.com:OpenNMS/opennms into 1.10