Merge branch 'stable'

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

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

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

diff --cc src/mkcephfs.in
Simple merge

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

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