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