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