merging from bsd1: removing samba3 package if it's installed; creating correct nss symlink