OpenNMS Development: jira-HZN-985-HZN-987 (19.0.0-SNAPSHOT)