Make sure the --heat-url option is respected

If the endpoint is passed in, make sure keystone uses it instead of
looking up the endpoint in the auth plugin.

Change-Id: I1c1c21d9533cd78f2dbfac91dcf0c6e9702b7c88
Closes-Bug: #1379933
Merge "Make sure the --heat-url option is respected"