OpenNMS Development: jira-NMS-9807 (22.0.0-SNAPSHOT)