test_shell test current not deprecated options

Several tests are testing the old deprecated options, update to the
current equivalents

Change-Id: Ibc09ed44b72e07f94511a5dc4fc6c79a1ff6d400
Make tokens work with --os-no-client-auth

Currently --os-no-client-auth assumes you'll only ever want to pass
a username and password to the standalone auth_password middleware,
but it's also valid to pass a token and endpoint, which can then
be used to either connect to a normal (non-standalone) Heat without
needing the client to connect to keystone, or pass a token to custom
auth middleware in standalone mode where tokens are accepted.

e.g:

heat --os-no-client-auth
      --heat-url http://127.0.0.1:8004/v1/<tenant ID>
      --os-auth-token <a token> stack-list

Change-Id: Ie22c85ba5b3b987505f4d6204b4dd6ff03e0d912
Closes-Bug: #1252248
Merge "test_shell test current not deprecated options"
Merge "Make tokens work with --os-no-client-auth"