OpenNMS Development: jira-HZN-1170 (21.0.0-SNAPSHOT)