sync with slc6 branch

remove accidently added cyrus-sasl/nss/nspr dependency and added back the cuda/blackhat/sherpa deps