Merge pull request #1207 from dachary/wip-7378

common: admin socket fallback to json-pretty format

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

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

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

diff --cc src/osdc/Objecter.cc
Simple merge

diff --cc src/test/Makefile.am
Simple merge