Bug fixes in deploy-script.js
Merge branch 'master' into ogprod