Merge branch 'wip-mds-encode-rebased'

Reviewed-by: Sage Weil <sage@inktank.com>

diff --cc src/Makefile.am
Simple merge

diff --cc src/client/Client.cc
Simple merge

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

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

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

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