OpenNMS Development: ag-jira-NMS-10609 (21.1.0-SNAPSHOT)