r10392: Merges from SAMBA_3_0 for 3.0.20a