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