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