OpenNMS Development: jira-HZN-1336 (22.0.2-SNAPSHOT)