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