Merge remote-tracking branch 'gh/wip-msgauth4'

diff --cc src/Makefile.am
Simple merge

diff --cc src/ceph_osd.cc
Simple merge

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

diff --cc src/include/types.h
Simple merge

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

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

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

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