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