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