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