Revert "Ensure a reasonable template is selected"

This reverts commit 307b50449152434c909a3d6d2d5bca42684ee387.

It's not ready for master yet.
increase the vm boot timeout for bluebox

as requested by bluebox
Merge branch 'master' into staging