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