* Disable Mistral
* Add puppet-watcher and enable it in scenario004
* pin tempest to a recent commit id that used to work