git-deploy updates for salt upgrade

Change-Id: I80aca184c1312a1cf03815cf79538e9a65ace0a9
Merge "git-deploy updates for salt upgrade" into production