Merge remote-tracking branch 'gh/giant'

diff --cc src/common/buffer.cc
Simple merge

diff --cc src/mon/Monitor.cc
Simple merge

diff --cc src/osdc/Objecter.cc
Simple merge

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

diff --cc src/test/erasure-code/ceph_erasure_code_benchmark.cc
Simple merge