OpenNMS Development: pr-jira-NMS-9240 (17.0.1-SNAPSHOT)