Revert "heatclient is not working with os-auth-token"

This reverts commit 4eab568f79bdbfe4ba0d31038bf3c253d0858c59.

The commit breaks the unit tests (and for some reason still passed
the gate...?), and also doesn't fix the issues with auth_token, ref
bug #1252248.  So revert this patch, while I work on a more
comprehensive fix to the auth_token issues.

Change-Id: I34b9e808928d091384c4c466f14260252a45fd2e
Closes-Bug: 1252313
Merge "Revert "heatclient is not working with os-auth-token""