OpenNMS Development: jira-NMS-10191-2016 (17.0.1-SNAPSHOT)