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