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