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