s3-tests and py3

I'm working on getting the test suite to run on the py3 branch, starting with rados. One of the failures I've run into is that s3-tests runs with python 2 instead of 3. This needs to be converted asap in order for us to make the jump to python 3. I started with a few trivial changes here https://github.com/ceph/s3-tests/pull/333 but I don't really know what I'm doing. Can someone more familiar with s3-tests and/or python take over? One question I had was around the s3tests vs s3tests_boto3 directories... which is the one that matters, and why is the old one still around? Or are they both still used and maintained? My other question is how the branches work. I'm guessing we should actually make the change to teh master branch and then cherry-pick it to ceph-master? I'm surprised how far apart master and ceph-master are. Thanks! sage