Merge remote branch 'origin/next'

diff --cc teuthology/misc.py
Simple merge

diff --cc teuthology/task/hadoop.py
Simple merge

diff --cc teuthology/task/install.py
index 198fee80c0056d69f166efce624a9af2a737920c,85c1f549f98cd5d5ce3f6a4aac6353ecd7352cc5..f0bff4121ebd53c668b3c293d5f9ff9489267f8d
--- 1/teuthology/task/install.py
--- 2/teuthology/task/install.py
+++ b/teuthology/task/install.py
@@@ -471,9 -471,9 +471,9 @@@ def _upgrade_ceph_packages(ctx, remote
      remote.run(
          args=[
              'sudo', 'apt-get', 'update', run.Raw('&&'),
 -            'sudo', 'DEBIAN_FRONTEND=noninteractive', 'apt-get', '-y', '--force-yes', 
 +            'sudo', 'DEBIAN_FRONTEND=noninteractive', 'apt-get', '-y', '--force-yes',
              '-o', run.Raw('Dpkg::Options::="--force-confdef"'), '-o', run.Raw('Dpkg::Options::="--force-confold"'),
-             'upgrade',
+             'install',
              ] + ['%s=%s' % (d, version) for d in debs],
          stdout=StringIO(),
          )

diff --cc teuthology/task/workunit.py
Simple merge