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