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