Bring Azure deploy scripts up to date

Commit 9934a0ace4a2a35463bf9c933eab9ab2b71a139a has changes that affect the global salt configs. 

Everything else is Azure specific.

Fixes #1731 #1485 
Can probably remove this comment block as it is mostly duplicated below.