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