Handle case where os_auth_token is set to ''

Properly handle case (as in CLI) where os_auth_token is
set, but to an empty string.

Change-Id: I7e96bf22e2a91e0e3ec783b406fd05e4138860c8
Merge "Handle case where os_auth_token is set to ''"