ceph-disk:  CalledProcessError has no output keyword on 2.6

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
Merge git://github.com/ceph/ceph