OpenNMS Development: jira-NMS-10309 (21.1.0-SNAPSHOT)