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