Always set the Heat deferred auth method
Always set the Heat deferred auth method

Otherwise in standalone mode we use the new default of "trusts"
which won't work.

Change-Id: If18db711faf7810217af0a89d1e38590a94d8e5b
Closes-bug: 1436631

liuquansheng47/devstack,Mahito/devstack,pacinete/devstack,vishnugonela/devstack,noironetworks/devstack,avvocatodemarchis/devstack,costingalan/devstack,group-policy/devstack,eharney/devstack,liuquansheng47/devstack,herrsechs/devstack,bljgaurav/openstack-test,wenhuizhang/devstack,vsham20/devstack,mssumanth/devstack,parul24/devstack,atulpatil301/devstack,group-policy/devstack,nuxeh/devstack,CloudServer/devstack,pczerkas/devstack,j4/devstack,bswartz/devstack,costingalan/devstack,LoHChina/devstack,varunarya10/devstack,kplus/devstack-moonshot,ozamiatin/devstack,dirkmueller/devstack,openstack-dev/devstack,vishnugonela/devstack,herrsechs/devstack,prithivm/branch01,neerja28/Devstack_GlusterFS,mc2014/devstack,richliu/devstack,pacinete/devstack,pombredanne/devstack,LoHChina/devstack,samgoon/devstack,dirkmueller/devstack,bswartz/devstack,thomasem/devstack,dtroyer/devstack,avvocatodemarchis/devstack,parul24/devstack,ozamiatin/devstack,nuxeh/devstack,HPCHub/devstack,CloudServer/devstack,dtroyer/devstack,noironetworks/devstack,mmasaki/devstack,flavio-fernandes/devstack,bigswitch/devstack,NaokiMiyata/devstack,mmasaki/devstack,upadhyay-prashant/devstack,atulpatil301/devstack,pczerkas/devstack,Mahito/devstack,andrewrothstein/devstack,vsham20/devstack,kplus/devstack-moonshot,pombredanne/devstack,openstack-dev/devstack,j4/devstack,thomasem/devstack,andrewrothstein/devstack,NaokiMiyata/devstack,TwinkleChawla/devstack,upadhyay-prashant/devstack,bigswitch/devstack,prithivm/branch01,bljgaurav/openstack-test,wenhuizhang/devstack,samgoon/devstack,varunarya10/devstack,flavio-fernandes/devstack,TwinkleChawla/devstack,neerja28/Devstack_GlusterFS,rushiagr/devstack,olivierlemasle/devstack,mssumanth/devstack,HPCHub/devstack,rushiagr/devstack,eharney/devstack,olivierlemasle/devstack,bq-xiao/devstack,richliu/devstack,mc2014/devstack,bq-xiao/devstack,nawawi/openstack,nawawi/openstack