Compute: use an instance object in terminate_instance
Compute: use an instance object in terminate_instance

The instance in terminate_instance is an object. Use the object format
when locking the instance.

TrivialFix

Change-Id: I7b40f0dcdbe1866443388a83957c4ebafadd978e

angdraug/nova,vmturbo/nova,gooddata/openstack-nova,devendermishrajio/nova,vmturbo/nova,dims/nova,fnordahl/nova,phenoxim/nova,akash1808/nova_test_latest,klmitch/nova,JioCloud/nova,raildo/nova,Tehsmash/nova,akash1808/nova,mmnelemane/nova,adelina-t/nova,mikalstill/nova,apporc/nova,CCI-MOC/nova,cloudbase/nova,NeCTAR-RC/nova,Juniper/nova,dawnpower/nova,klmitch/nova,cloudbase/nova-virtualbox,openstack/nova,varunarya10/nova_test_latest,devendermishrajio/nova_test_latest,JianyuWang/nova,cernops/nova,belmiromoreira/nova,Stavitsky/nova,mikalstill/nova,zhimin711/nova,isyippee/nova,Tehsmash/nova,Francis-Liu/animated-broccoli,jeffrey4l/nova,CEG-FYP-OpenStack/scheduler,maelnor/nova,sebrandon1/nova,mahak/nova,JioCloud/nova_test_latest,tealover/nova,CCI-MOC/nova,kimjaejoong/nova,ted-gould/nova,jianghuaw/nova,bgxavier/nova,rajalokan/nova,eonpatapon/nova,akash1808/nova_test_latest,projectcalico/calico-nova,Metaswitch/calico-nova,tangfeixiong/nova,NeCTAR-RC/nova,j-carpentier/nova,Juniper/nova,felixma/nova,hanlind/nova,hanlind/nova,yatinkumbhare/openstack-nova,mgagne/nova,BeyondTheClouds/nova,yosshy/nova,yosshy/nova,vmturbo/nova,cloudbase/nova,silenceli/nova,alvarolopez/nova,mandeepdhami/nova,BeyondTheClouds/nova,cloudbase/nova,bgxavier/nova,yatinkumbhare/openstack-nova,barnsnake351/nova,isyippee/nova,jeffrey4l/nova,apporc/nova,scripnichenko/nova,rajalokan/nova,varunarya10/nova_test_latest,jianghuaw/nova,rajalokan/nova,rahulunair/nova,vmturbo/nova,MountainWei/nova,tangfeixiong/nova,zzicewind/nova,fnordahl/nova,petrutlucian94/nova,mmnelemane/nova,cloudbase/nova-virtualbox,LoHChina/nova,JioCloud/nova_test_latest,alexandrucoman/vbox-nova-driver,Metaswitch/calico-nova,scripnichenko/nova,cernops/nova,TwinkleChawla/nova,cernops/nova,mikalstill/nova,projectcalico/calico-nova,adelina-t/nova,openstack/nova,mahak/nova,eonpatapon/nova,watonyweng/nova,edulramirez/nova,affo/nova,silenceli/nova,phenoxim/nova,joker946/nova,mandeepdhami/nova,LoHChina/nova,ruslanloman/nova,gooddata/openstack-nova,gooddata/openstack-nova,nikesh-mahalka/nova,devendermishrajio/nova_test_latest,akash1808/nova,felixma/nova,cyx1231st/nova,double12gzh/nova,takeshineshiro/nova,thomasem/nova,Juniper/nova,tealover/nova,orbitfp7/nova,j-carpentier/nova,affo/nova,blueboxgroup/nova,zzicewind/nova,rahulunair/nova,joker946/nova,orbitfp7/nova,maelnor/nova,bigswitch/nova,CloudServer/nova,jianghuaw/nova,angdraug/nova,edulramirez/nova,iuliat/nova,nikesh-mahalka/nova,alexandrucoman/vbox-nova-driver,shail2810/nova,sebrandon1/nova,ted-gould/nova,belmiromoreira/nova,dawnpower/nova,BeyondTheClouds/nova,Juniper/nova,MountainWei/nova,TwinkleChawla/nova,tudorvio/nova,Yusuke1987/openstack_template,cyx1231st/nova,ruslanloman/nova,rahulunair/nova,CloudServer/nova,tudorvio/nova,zaina/nova,Francis-Liu/animated-broccoli,klmitch/nova,barnsnake351/nova,alaski/nova,gooddata/openstack-nova,JioCloud/nova,bigswitch/nova,alvarolopez/nova,rajalokan/nova,mahak/nova,hanlind/nova,raildo/nova,openstack/nova,jianghuaw/nova,kimjaejoong/nova,zhimin711/nova,takeshineshiro/nova,badock/nova,Stavitsky/nova,whitepages/nova,sebrandon1/nova,blueboxgroup/nova,zaina/nova,watonyweng/nova,mgagne/nova,devendermishrajio/nova,whitepages/nova,JianyuWang/nova,CEG-FYP-OpenStack/scheduler,badock/nova,Yusuke1987/openstack_template,petrutlucian94/nova,iuliat/nova,dims/nova,noironetworks/nova,alaski/nova,double12gzh/nova,thomasem/nova,noironetworks/nova,klmitch/nova,shail2810/nova