upgrade/rgw*: use correct branch for s3tests

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