Don't enabled nova-objectstore if swift is enabled
Don't enabled nova-objectstore if swift is enabled

- Fixes bug 957178.

Change-Id: Ieb2840344bf8c0d9a1da50925f5ca0649d9dad21

eharney/devstack,costingalan/devstack,sstrato/devstack,wenhuizhang/devstack,mc2014/devstack,avvocatodemarchis/devstack,liuquansheng47/devstack,pczerkas/devstack,varunarya10/devstack,deepakselvaraj/devstack,bswartz/devstack,bljgaurav/openstack-test,cloudbuilders/devstack,innodee/openstackk,vsham20/devstack,prithivm/branch01,promptworks/devstack,richliu/devstack,nawawi/openstack,olivierlemasle/devstack,liuquansheng47/devstack,dtroyer/devstack,savi-dev/devstack,pombredanne/devstack,NaokiMiyata/devstack,Mahito/devstack,citrix-openstack-build/devstack,andrewrothstein/devstack,mmasaki/devstack,herrsechs/devstack,inkerra/devstack,NaokiMiyata/devstack,herrsechs/devstack,eshnil2000/devstack,CiscoSystems/devstack,noironetworks/devstack,BSJAIN92/OpenStack,yamt/devstack,ozamiatin/devstack,LoHChina/devstack,srics/devstack,vishnugonela/devstack,samgoon/devstack,nati/devstack_public,thomasem/devstack,rushiagr/devstack,openstack-dev/devstack,kplus/devstack-moonshot,Mahito/devstack,shootstar/devstacktest,wenhuizhang/devstack,r-mibu/devstack,Juniper/devstack,avvocatodemarchis/devstack,HPCHub/devstack,mssumanth/devstack,bljgaurav/openstack-test,sequenceiq/devstack,TwinkleChawla/devstack,jamielennox/devstack,LoHChina/devstack,sequenceiq/devstack,dirkmueller/devstack,tianweizhang/devstack,group-policy/devstack,TwinkleChawla/devstack,pczerkas/devstack,eharney/devstack,savi-dev/devstack,varunarya10/devstack,bigswitch/devstack,thomasem/devstack,JioCloud/devstack,ewindisch/raspi-devstack,parul24/devstack,armando-migliaccio/devstack,promptworks/devstack,ozamiatin/devstack,dtroyer/devstack,nuxeh/devstack,CloudServer/devstack,parul24/devstack,ykaneko/devstack,ewindisch/raspi-devstack,kplus/devstack-moonshot,neerja28/Devstack_GlusterFS,andrewrothstein/devstack,pacinete/devstack,Millnert/contrail-devstack,costingalan/devstack,dirkmueller/devstack,cloudbuilders/devstack,j4/devstack,mmasaki/devstack,flavio-fernandes/devstack,BSJAIN92/OpenStack,ykaneko/devstack,bq-xiao/devstack,neerja28/Devstack_GlusterFS,sc68cal/devstack,rushiagr/devstack,j4/devstack,sc68cal/devstack,nawawi/openstack,flavio-fernandes/devstack,group-policy/devstack,pacinete/devstack,nttmcl/devstack_public,upadhyay-prashant/devstack,upadhyay-prashant/devstack,prithivm/branch01,richliu/devstack,nati/devstack_public,openstack-dev/devstack,bswartz/devstack,vsham20/devstack,tianweizhang/devstack,olivierlemasle/devstack,virtualopensystems/devstack,nttmcl/devstack_public,vishnugonela/devstack,citrix-openstack-build/devstack,affo/devstack,affo/devstack,mc2014/devstack,samgoon/devstack,williamthegrey/devstack,HPCHub/devstack,r-mibu/devstack,atulpatil301/devstack,Yuriy-Leonov/devstack,pombredanne/devstack,CloudServer/devstack,mssumanth/devstack,bq-xiao/devstack,bigswitch/devstack,atulpatil301/devstack,noironetworks/devstack,nuxeh/devstack