Merge branch 'master' into add-minimal-dispatcher

diff --cc setup.py
index 71539fd4e4f4b3601c46dd5441a15324c6954cf6,119732e869d9e08d940907ff0eb448a4759fd680..87c573a4e54db636d810bba492cad245ce9066eb
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -129,7 -130,7 +130,8 @@@ setup
              'teuthology-prune-logs = scripts.prune_logs:main',
              'teuthology-describe = scripts.describe:main',
              'teuthology-reimage = scripts.reimage:main',
-             'teuthology-dispatcher = scripts.dispatcher:main'
++            'teuthology-dispatcher = scripts.dispatcher:main',
+             'teuthology-wait = scripts.wait:main',
              ],
          },
  

diff --cc teuthology/misc.py
Simple merge

diff --cc teuthology/task/internal/__init__.py
Simple merge