Fix of issue #SPC-570
Merge branch 'master' of github.com:OpenNMS/opennms