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