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