upgrade/rgw*: use correct branch for s3tests

Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit ccbd9b0ccbc435a5d9ffe499fde281463d569727)