s3_token has been moved to keystoneclient.

Change-Id: I6ffe756d517d11f323bd0c5d3b877d9a9f739a3b
Merge "s3_token has been moved to keystoneclient."