Start of merging changes with SAMBA_3_0. Fix up some comments so that