Merge remote-tracking branch 'origin/wip-14048' into greg-fs-testing

https://github.com/ceph/ceph-qa-suite/pull/767

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

diff --cc tasks/cephfs/test_sessionmap.py
index 0c9b9424272267e4c5741a793ba2206eb2fa92bf,11253232dbf845905aa02415db572d4db7b62009..9ee0a7e87c6f6824f49290e8cb4b9a556a8d0235
--- 1/tasks/cephfs/test_sessionmap.py
--- 2/tasks/cephfs/test_sessionmap.py
+++ b/tasks/cephfs/test_sessionmap.py
@@@ -1,8 -1,6 +1,8 @@@
- 
+ from StringIO import StringIO
  import json
  import logging
 +from tasks.cephfs.fuse_mount import FuseMount
 +from teuthology.exceptions import CommandFailedError
  from tasks.cephfs.cephfs_test_case import CephFSTestCase
  
  log = logging.getLogger(__name__)