Fix some deployment permission issues.
Merge branch 'master' into gsa