OpenNMS Development: jira-NMS-8425 (18.0.1-SNAPSHOT)