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