Cleanup of templates no longer needed and doubled the wait time for the
cloud-set-guestpassword and cloud-set-guestsshkey init scripts to run.