Merge remote-tracking branch 'gh/jewel'

diff --cc src/client/Client.cc
Simple merge

diff --cc src/common/config_opts.h
Simple merge

diff --cc src/mds/MDCache.cc
Simple merge

diff --cc src/mds/MDCache.h
Simple merge

diff --cc src/mds/MDLog.cc
Simple merge

diff --cc src/mds/MDLog.h
Simple merge

diff --cc src/mds/MDSDaemon.cc
Simple merge

diff --cc src/test/libcephfs/test.cc
Simple merge