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