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