Merge branch 'master' into wip-freebsd

diff --cc src/Makefile.am
Simple merge

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

diff --cc src/crushtool.cc
Simple merge

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

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

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

diff --cc src/os/FileStore.cc
Simple merge

diff --cc src/os/JournalingObjectStore.cc
Simple merge

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

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

diff --cc src/tools/ceph.cc
Simple merge