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