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