Revert "Changed s3tests to run off "branch: giant-noreason" per Yehuda's...

Reverts ceph/ceph-qa-suite#213

Trying something else less disruptive