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