good changes from upstream

Author: cjac

templates/dask/dask.sh.in

@@ -31,7 +31,7 @@ function main() {
 
     configure_knox_for_dask
 
-    local DASK_CLOUD_LOGGING="$(get_metadata_attribute dask-cloud-logging || echo 'false')"
+    local DASK_CLOUD_LOGGING="$(get_metadata_attribute dask-cloud-logging 'false')"
     if [[ "${DASK_CLOUD_LOGGING}" == "true" ]]; then
       configure_fluentd_for_dask
     fi
@@ -51,7 +51,7 @@ function exit_handler() {
 
 function prepare_to_install(){
   prepare_common_env
-  prepare_pip_env
+  prepare_conda_env
   conda_env="$(get_metadata_attribute conda-env 'dask')"
   readonly conda_env
   prepare_dask_env