OpenNMS Development: pr-jira-NMS-8704 (20.0.0-SNAPSHOT)