OpenNMS Development: jira-NMS-8978 (18.0.3-SNAPSHOT)