OpenNMS Development: jira-HZN-1202-fix-agent (22.0.0-SNAPSHOT)