OpenNMS Development: jira-NMS-10409 (17.0.1-SNAPSHOT)