Simplify git-deploy configuration

Change-Id: I718669497a1ad0760f38ad21ad7b4353b40b68d0
Merge "Simplify git-deploy configuration" into production