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