OpenNMS Development: jira-HZN-1236 (22.0.0-SNAPSHOT)