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