OpenNMS Development: jira-NMS-10268-with-NMS-10228 (21.1.0-SNAPSHOT)