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