Remerge trunk.
Remerge trunk.

rickerc/nova_audit,gooddata/openstack-nova,eneabio/nova,akash1808/nova_test_latest,sebrandon1/nova,zhimin711/nova,yrobla/nova,zhimin711/nova,yrobla/nova,savi-dev/nova,DirectXMan12/nova-hacking,alaski/nova,viggates/nova,aristanetworks/arista-ovs-nova,mmnelemane/nova,DirectXMan12/nova-hacking,josephsuh/extra-specs,bigswitch/nova,gspilio/nova,kimjaejoong/nova,devoid/nova,Triv90/Nova,devoid/nova,sridevikoushik31/openstack,tealover/nova,superstack/nova,varunarya10/nova_test_latest,TwinkleChawla/nova,jianghuaw/nova,mikalstill/nova,tudorvio/nova,alexandrucoman/vbox-nova-driver,Stavitsky/nova,gooddata/openstack-nova,JioCloud/nova_test_latest,NewpTone/stacklab-nova,ntt-sic/nova,NoBodyCam/TftpPxeBootBareMetal,rrader/nova-docker-plugin,cernops/nova,cernops/nova,OpenAcademy-OpenStack/nova-scheduler,sridevikoushik31/nova,hanlind/nova,sridevikoushik31/nova,mandeepdhami/nova,sridevikoushik31/openstack,Juniper/nova,zzicewind/nova,cloudbau/nova,bclau/nova,blueboxgroup/nova,cloudbase/nova-virtualbox,Yusuke1987/openstack_template,russellb/nova,berrange/nova,citrix-openstack-build/nova,nikesh-mahalka/nova,eayunstack/nova,josephsuh/extra-specs,cloudbase/nova-virtualbox,noironetworks/nova,devendermishrajio/nova_test_latest,whitepages/nova,maheshp/novatest,maelnor/nova,ted-gould/nova,usc-isi/extra-specs,salv-orlando/MyRepo,termie/nova-migration-demo,josephsuh/extra-specs,JianyuWang/nova,termie/pupa,tanglei528/nova,dstroppa/openstack-smartos-nova-grizzly,Francis-Liu/animated-broccoli,TieWei/nova,CCI-MOC/nova,apporc/nova,berrange/nova,CloudServer/nova,usc-isi/nova,raildo/nova,gooddata/openstack-nova,rrader/nova-docker-plugin,tealover/nova,NoBodyCam/TftpPxeBootBareMetal,paulmathews/nova,fajoy/nova,petrutlucian94/nova_dev,klmitch/nova,qwefi/nova,badock/nova,tangfeixiong/nova,tanglei528/nova,usc-isi/nova,rajalokan/nova,rahulunair/nova,NeCTAR-RC/nova,JioCloud/nova,zaina/nova,shahar-stratoscale/nova,Metaswitch/calico-nova,kimjaejoong/nova,takeshineshiro/nova,watonyweng/nova,CiscoSystems/nova,tudorvio/nova,paulmathews/nova,devendermishrajio/nova,mahak/nova,noironetworks/nova,devendermishrajio/nova,raildo/nova,iuliat/nova,CEG-FYP-OpenStack/scheduler,akash1808/nova,mahak/nova,Yuriy-Leonov/nova,shail2810/nova,j-carpentier/nova,aristanetworks/arista-ovs-nova,termie/nova-migration-demo,felixma/nova,mgagne/nova,viggates/nova,petrutlucian94/nova_dev,KarimAllah/nova,dstroppa/openstack-smartos-nova-grizzly,mmnelemane/nova,ruslanloman/nova,leilihh/nova,termie/pupa,NoBodyCam/TftpPxeBootBareMetal,joker946/nova,Triv90/Nova,Metaswitch/calico-nova,houshengbo/nova_vmware_compute_driver,ted-gould/nova,BeyondTheClouds/nova,thomasem/nova,scripnichenko/nova,cyx1231st/nova,JioCloud/nova,double12gzh/nova,leilihh/nova,klmitch/nova,ruslanloman/nova,barnsnake351/nova,termie/pupa,savi-dev/nova,savi-dev/nova,sebrandon1/nova,whitepages/nova,maoy/zknova,ewindisch/nova,shail2810/nova,j-carpentier/nova,usc-isi/nova,devendermishrajio/nova_test_latest,Stavitsky/nova,barnsnake351/nova,maheshp/novatest,double12gzh/nova,takeshineshiro/nova,maoy/zknova,scripnichenko/nova,vladikr/nova_drafts,usc-isi/extra-specs,superstack/nova,sridevikoushik31/nova,mikalstill/nova,virtualopensystems/nova,sacharya/nova,shootstar/novatest,rajalokan/nova,leilihh/novaha,felixma/nova,JianyuWang/nova,salv-orlando/MyRepo,virtualopensystems/nova,openstack/nova,fajoy/nova,thomasem/nova,zzicewind/nova,saleemjaveds/https-github.com-openstack-nova,maheshp/novatest,jianghuaw/nova,SUSE-Cloud/nova,sridevikoushik31/nova,luogangyi/bcec-nova,gspilio/nova,watonyweng/nova,yatinkumbhare/openstack-nova,BeyondTheClouds/nova,gooddata/openstack-nova,cloudbase/nova,dims/nova,imsplitbit/nova,angdraug/nova,OpenAcademy-OpenStack/nova-scheduler,Juniper/nova,yosshy/nova,edulramirez/nova,gspilio/nova,Brocade-OpenSource/OpenStack-DNRM-Nova,openstack/nova,sileht/deb-openstack-nova,vmturbo/nova,Brocade-OpenSource/OpenStack-DNRM-Nova,edulramirez/nova,klmitch/nova,spring-week-topos/nova-week,ewindisch/nova,alexandrucoman/vbox-nova-driver,alvarolopez/nova,imsplitbit/nova,MountainWei/nova,BeyondTheClouds/nova,houshengbo/nova_vmware_compute_driver,SUSE-Cloud/nova,bgxavier/nova,fnordahl/nova,saleemjaveds/https-github.com-openstack-nova,jeffrey4l/nova,sridevikoushik31/openstack,LoHChina/nova,sileht/deb-openstack-nova,salv-orlando/MyRepo,MountainWei/nova,psiwczak/openstack,leilihh/novaha,vmturbo/nova,shahar-stratoscale/nova,russellb/nova,NeCTAR-RC/nova,eonpatapon/nova,badock/nova,tangfeixiong/nova,eneabio/nova,eayunstack/nova,sileht/deb-openstack-nova,Juniper/nova,alvarolopez/nova,NewpTone/stacklab-nova,cloudbase/nova,CiscoSystems/nova,citrix-openstack-build/nova,eneabio/nova,yrobla/nova,varunarya10/nova_test_latest,jianghuaw/nova,eonpatapon/nova,nikesh-mahalka/nova,dims/nova,qwefi/nova,CloudServer/nova,fajoy/nova,adelina-t/nova,dawnpower/nova,affo/nova,yosshy/nova,blueboxgroup/nova,rahulunair/nova,CCI-MOC/nova,sacharya/nova,maelnor/nova,eharney/nova,Juniper/nova,usc-isi/extra-specs,dawnpower/nova,ntt-sic/nova,orbitfp7/nova,NewpTone/stacklab-nova,zaina/nova,spring-week-topos/nova-week,tianweizhang/nova,hanlind/nova,TwinkleChawla/nova,cloudbase/nova,iuliat/nova,mandeepdhami/nova,redhat-openstack/nova,vmturbo/nova,isyippee/nova,bclau/nova,cernops/nova,rickerc/nova_audit,fnordahl/nova,redhat-openstack/nova,termie/nova-migration-demo,petrutlucian94/nova,aristanetworks/arista-ovs-nova,angdraug/nova,shootstar/novatest,klmitch/nova,phenoxim/nova,russellb/nova,paulmathews/nova,Tehsmash/nova,bgxavier/nova,openstack/nova,LoHChina/nova,houshengbo/nova_vmware_compute_driver,Tehsmash/nova,jianghuaw/nova,Francis-Liu/animated-broccoli,sebrandon1/nova,belmiromoreira/nova,rajalokan/nova,petrutlucian94/nova,mahak/nova,silenceli/nova,orbitfp7/nova,hanlind/nova,vladikr/nova_drafts,silenceli/nova,Yuriy-Leonov/nova,tianweizhang/nova,projectcalico/calico-nova,vmturbo/nova,bigswitch/nova,Triv90/Nova,akash1808/nova_test_latest,mikalstill/nova,projectcalico/calico-nova,KarimAllah/nova,alaski/nova,KarimAllah/nova,plumgrid/plumgrid-nova,dstroppa/openstack-smartos-nova-grizzly,eharney/nova,TieWei/nova,plumgrid/plumgrid-nova,superstack/nova,affo/nova,yatinkumbhare/openstack-nova,phenoxim/nova,mgagne/nova,psiwczak/openstack,adelina-t/nova,cyx1231st/nova,luogangyi/bcec-nova,rajalokan/nova,CEG-FYP-OpenStack/scheduler,joker946/nova,isyippee/nova,DirectXMan12/nova-hacking,rahulunair/nova,apporc/nova,akash1808/nova,Yusuke1987/openstack_template,belmiromoreira/nova,psiwczak/openstack,maoy/zknova,jeffrey4l/nova,cloudbau/nova,JioCloud/nova_test_latest