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