OpenNMS Development: jira-NMS-10009-meridian-2018 (21.1.0-SNAPSHOT)