diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 8d3ba96d48..4faa0c51f7 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-930be8e9c5100b0a29f0f7b16797ef7ccdaf2af7
+c9728844c67e4a84d2806661bc16fc3a22414bd8
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index 7051ae2027..8f3142106a 100755
--- a/common/scripts/setup_env.sh
+++ b/common/scripts/setup_env.sh
@@ -97,7 +97,7 @@ do
 done
 
 # Set conditional host mounts
-export CONDITIONAL_HOST_MOUNTS=${CONDITIONAL_HOST_MOUNTS:-}
+export CONDITIONAL_HOST_MOUNTS="${CONDITIONAL_HOST_MOUNTS:-} "
 container_kubeconfig=''
 
 # docker conditional host mount (needed for make docker push)