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