r16465: merge a few miniro SAMBA_3_0 fixes