OpenNMS Development: jira-NMS-8588 (18.0.1-SNAPSHOT)