Use curl exclusively in vSphere deployment

This fixes #2295.

I also removed the superfluous `MASTER_HTPASSWD` line in the salt master template, since that is now generated in the salt overlay tree.
Nevermind, was checking an older version of those scripts.