OpenNMS Development: jira-NMS-9921 (22.0.4-SNAPSHOT)