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