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