Re-generate sample config file
Re-generate sample config file

Changes include:

  - recent resource tracker changes moved around options and added
    new options like disk_allocation_ratio
  - new send_arp_for_ha_count option
  - qpid_heartbeat default increased
  - volume_tmp_dir added by image cloning support
  - netapp_nfs and solidfire volume driver additions

DocImpact: update nova.conf docs
Change-Id: I4b53e4c51a40de1321f70a2bed16ac7020a2f160

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