Merge "stack.sh: Clear OpenStack related envvars"