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