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