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