OpenNMS Development: jira-HZN-1260 (21.0.5-SNAPSHOT)