OpenNMS Development: jira-NMS-8330 (18.0.4-SNAPSHOT)