saltstack/salt-cloud — pull request #627 by s0undt3ch (2013-06-11 18:39:06+00:00)
Title: Hotfixes cherry pick

These are several fixes included in #599 which are better included now since the more I tweak the code to fix #546, the more I think I need to redo #599.