OpenNMS Development: pr-NMS-7123 (17.0.1-SNAPSHOT)