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