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