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