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