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