r16256: sync up to r16255 from SAMBA_3_0