Preparing virtual machines first and then everything else to help placement
Merge pull request #621 from dswd/two-step-prepare

Preparing virtual machines first and then everything else to help placement