Merge branch wip-librados-timeout

Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Loic Dachary <loic@dachary.org>

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

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

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

diff --cc src/osd/OSD.cc
Simple merge