Update s3 test to import unittest2

Same thing as botocore, tests can import
tests.unittest and it will pick the appropriate
version.