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