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