manual cherry-picking of 70a1f18

Allows to use 'ceph-deploy mon create-initial' so that
monitor quorum is more robust

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>