OpenNMS Development: nms-9829-bug (21.0.4-SNAPSHOT)