Also deactivate trove and tempest

Other upgrade testing with mkcloud simply fails 100% of the
time for me.
Merge pull request #22 from dirkmueller/master

Also deactivate trove and tempest