r23248: Merge echo pipe implementation chanegs from SAMBA_3_0_26