OpenNMS Development: jira-HZN-1258 (21.1.0-SNAPSHOT)