upgrade: fix client ids
upgrade/rgw: run first s3tests pass using bobtail tests

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