SPC-801 & SPC-804 remove fix
SPC-801 & SPC-804 collapse fix
Merge branch 'space/13.2' of git://github.com/OpenNMS/opennms into space-13.2