Merge commit 'origin/msgr' into unstable

Conflicts:

	src/start.sh

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

diff --cc src/kernel/client.c
Simple merge

diff --cc src/kernel/messenger.c
Simple merge

diff --cc src/kernel/messenger.h
Simple merge

diff --cc src/msg/SimpleMessenger.cc
Simple merge

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