[packages_10.03.2] samba: merge r29199, r29251