Merge remote branch 'origin/stable'

Conflicts:
	src/osdc/Journaler.cc

diff --cc configure.ac
Simple merge

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

diff --cc src/mds/MDSMap.h
Simple merge

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

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

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

diff --cc src/rgw/rgw_cache.h
Simple merge