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