OpenNMS Development: jira-NMS-7797-2018 (24.0.0-SNAPSHOT)