OpenNMS Development: jira-NMS-8018 (18.0.0-SNAPSHOT)