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