SPC-964 fix for categories
Merge branch 'space/14.1' of git://github.com/OpenNMS/opennms into space-14.1-R1-freeze