rbd: remove merge cruft

Signed-off-by: Sage Weil <sage@inktank.com>
install radosgw

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