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