Merge pull request #222 from ceph/wip-3495

Reviewed-by: Greg Farnum <greg@inktank.com>

diff --cc src/mon/MDSMonitor.h
Simple merge

diff --cc src/mon/Monitor.cc
Simple merge

diff --cc src/mon/Monitor.h
Simple merge

diff --cc src/mon/PaxosService.h
Simple merge