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