[bcl] Sync recent NS2.1 changes (#15696)