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