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