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