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