Merge "Port object_storage tests to Py3."