Fix deploying from vcloud templates

The conversion from single monolithic step to a library didn't quite work for the vcloud version. This does the trick, and also fixes some other minor issues with how vcloud is managed and how we report errors around it.