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