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