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