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