Merge remote-tracking branch 'gh/firefly'

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

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

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

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

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