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