OpenNMS Development: jira-NMS-8642-8643 (19.0.0-SNAPSHOT)