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