Merge pull request #2586 from ceph/wip-mon-status

mon: make health portion of ceph -s readable (multiple lines)

Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>

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

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

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

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