Merge "Add workaround to apt to use with mirrors located on Amazon S3."