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