Merge "envsetup: fix for provision to work on zsh"