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