Numerous git-deploy related updates

Change-Id: I5b4925fe41d79e7c1ca6185d36d3f5cf76daea22