Rollback workaround for Marconi
Rollback workaround for Marconi

This patch rollsback the stderr redirection in Marconi.

Change-Id: Iaa2d897295cf2bc2e4a8c370d3e0592def337c78

parul24/devstack,olivierlemasle/devstack,avvocatodemarchis/devstack,nawawi/openstack,CloudServer/devstack,nuxeh/devstack,neerja28/Devstack_GlusterFS,herrsechs/devstack,rushiagr/devstack,BSJAIN92/OpenStack,liuquansheng47/devstack,prithivm/branch01,samgoon/devstack,bswartz/devstack,kplus/devstack-moonshot,mmasaki/devstack,williamthegrey/devstack,sc68cal/devstack,varunarya10/devstack,richliu/devstack,LoHChina/devstack,j4/devstack,TwinkleChawla/devstack,LoHChina/devstack,vsham20/devstack,pacinete/devstack,dirkmueller/devstack,pombredanne/devstack,innodee/openstackk,tianweizhang/devstack,pacinete/devstack,rushiagr/devstack,noironetworks/devstack,noironetworks/devstack,eharney/devstack,costingalan/devstack,sc68cal/devstack,thomasem/devstack,j4/devstack,herrsechs/devstack,srics/devstack,dtroyer/devstack,HPCHub/devstack,sequenceiq/devstack,richliu/devstack,eshnil2000/devstack,varunarya10/devstack,jamielennox/devstack,bq-xiao/devstack,thomasem/devstack,HPCHub/devstack,nawawi/openstack,flavio-fernandes/devstack,samgoon/devstack,CloudServer/devstack,atulpatil301/devstack,bswartz/devstack,bigswitch/devstack,neerja28/Devstack_GlusterFS,costingalan/devstack,avvocatodemarchis/devstack,kplus/devstack-moonshot,mc2014/devstack,olivierlemasle/devstack,nuxeh/devstack,flavio-fernandes/devstack,pombredanne/devstack,pczerkas/devstack,promptworks/devstack,parul24/devstack,openstack-dev/devstack,andrewrothstein/devstack,vsham20/devstack,bigswitch/devstack,affo/devstack,pczerkas/devstack,group-policy/devstack,virtualopensystems/devstack,Juniper/devstack,eharney/devstack,Mahito/devstack,bljgaurav/openstack-test,mc2014/devstack,ozamiatin/devstack,group-policy/devstack,andrewrothstein/devstack,vishnugonela/devstack,TwinkleChawla/devstack,Mahito/devstack,NaokiMiyata/devstack,vishnugonela/devstack,dirkmueller/devstack,mmasaki/devstack,atulpatil301/devstack,affo/devstack,wenhuizhang/devstack,BSJAIN92/OpenStack,mssumanth/devstack,tianweizhang/devstack,JioCloud/devstack,promptworks/devstack,NaokiMiyata/devstack,mssumanth/devstack,liuquansheng47/devstack,prithivm/branch01,sequenceiq/devstack,ozamiatin/devstack,openstack-dev/devstack,upadhyay-prashant/devstack,dtroyer/devstack,bq-xiao/devstack,wenhuizhang/devstack,bljgaurav/openstack-test,upadhyay-prashant/devstack