Support --os-auth-token.

Fixed bug #1130286.

Change-Id: Ia0a8884f2738c31c3d91d6679622ebd3ec9b86b5
Merge "Support --os-auth-token."