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