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