r16472: final pass for 3.0.23rc3 I think. Current with SAMBA_3_0 r16471