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