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