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