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