Support alternate S3 hostnames

Change-Id: I9a27eb5fb9c4e5ef3b516ce9cf5a4b5bb4e1df61