Merge branch 'wip_ceph_context'

diff --cc src/cauthtool.cc
Simple merge

diff --cc src/cosd.cc
Simple merge

diff --cc src/include/rados/librados.h
Simple merge

diff --cc src/librados.cc
Simple merge

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