OpenNMS Development: jira-HZN-1333 (22.0.4-SNAPSHOT)