Further fix standalone authentication
Further fix standalone authentication

Whilst a previous patch fixed the main problem in using the keystone v2
client these references were missed. The v2 client has not been updated
to use the session so it has no session attribute that can be relied
upon.

In this patch I've left a FIXME to make this session object more global.
My hope is that when all these smaller issues have been eradicated we
can come back and make a more consistent authentication workflow for all
these clients.

Change-Id: I50012daf8b8669f1910003f73296a6c16b6b4cf3
Related-Bug: #1416170

steveb/heat,dragorosson/heat,jasondunsmore/heat,rh-s/heat,maestro-hybrid-cloud/heat,cryptickp/heat,rh-s/heat,noironetworks/heat,gonzolino/heat,pratikmallya/heat,rdo-management/heat,rdo-management/heat,cryptickp/heat,maestro-hybrid-cloud/heat,dragorosson/heat,takeshineshiro/heat,srznew/heat,pshchelo/heat,miguelgrinberg/heat,openstack/heat,srznew/heat,dims/heat,cwolferh/heat-scratch,jasondunsmore/heat,openstack/heat,steveb/heat,pratikmallya/heat,gonzolino/heat,takeshineshiro/heat,dims/heat,cwolferh/heat-scratch,noironetworks/heat,pshchelo/heat,miguelgrinberg/heat