merging some packaging fixes from SAMBA_2_2