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