Merge remote-tracking branch 'origin/master' into wip-ceph-cli

Conflicts:
	src/mon/OSDMonitor.cc
	src/osd/OSD.cc
	src/osd/ReplicatedPG.cc
librados, rados.py: add rados_create2/init2

librados clients, particularly the ceph tool, need to be able
to specify a full 'name'; rados_create enforced 'client.<param>'
with no workaround.  New interface.  Python Rados().__init__ selects
appropriate create function depending on whether name or id is
supplied.

Signed-off-by: Dan Mick <dan.mick@inktank.com>
ceph: cleanup: accept --conf *and* -c; suppress stderr if no outs

Signed-off-by: Dan Mick <dan.mick@inktank.com>