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