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