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