OpenNMS Development: jira-NMS-9846 (21.0.4-SNAPSHOT)