Smarter s3tests branch selection

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>