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