heatclient is not working with os-auth-token

heatclient is failing if os-auth-token (OS_AUTH_TOKEN) is
provided. With this change, user can provide either auth token
or password with heatclient command line tool (heat).

Closes Bug: #1248265

Change-Id: I22b6af351dd3a371443f432b04785c706eff8325
Merge "heatclient is not working with os-auth-token"