r20268: merge -r 20261:20263 from samba_3_0_24