Merge branch 'unstable'

Conflicts:
	teuthology/task/workunit.py

diff --cc teuthology/task/workunit.py
index 3f5225df6d1ea03af8f7f6b76ac506170cd5966b,147700e0983e1b863c7ac4c3170123fc52997cf5..0844cad2d5cc862bfdb87014b68be215bfa74800
--- 1/teuthology/task/workunit.py
--- 2/teuthology/task/workunit.py
+++ b/teuthology/task/workunit.py
@@@ -276,12 -274,7 +274,8 @@@ def _run_tests(ctx, refspec, role, test
                      'cd', '--', scratch_tmp,
                      run.Raw('&&'),
                      run.Raw('CEPH_REF={ref}'.format(ref=ceph_ref)),
-                     run.Raw('PATH="$PATH:{tdir}/binary/usr/local/bin"'.format(tdir=testdir)),
-                     run.Raw('LD_LIBRARY_PATH="$LD_LIBRARY_PATH:{tdir}/binary/usr/local/lib"'.format(tdir=testdir)),
                      run.Raw('CEPH_JAVA_PATH="{tdir}/binary/usr/local/share/java"'.format(tdir=testdir)),
-                     run.Raw('CEPH_CONF="{tdir}/ceph.conf"'.format(tdir=testdir)),
 +                    run.Raw('TESTDIR="{tdir}"'.format(tdir=testdir)),
-                     run.Raw('CEPH_SECRET_FILE="{file}"'.format(file=secretfile)),
                      run.Raw('CEPH_ID="{id}"'.format(id=id_)),
                      run.Raw('PYTHONPATH="$PYTHONPATH:{tdir}/binary/usr/local/lib/python2.7/dist-packages:{tdir}/binary/usr/local/lib/python2.6/dist-packages"'.format(tdir=testdir)),
                      ]