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