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