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