SW-5690 - Fix merge regression
SW-5690 - Fix merge regression

SvenHerrmann/shopware,simkli/shopware,oktupol/shopware,mreiss/shopware,dnoegel/shopware-aop,ShopwareHackathon/scale-commerce-ongr-bundle,fegoulart/shopware,arvatis/shopware,ShopwareHackathon/dompdf,VIISON/shopware-4,bcremer/shopware,arvatis/shopware,xabbuh/shopware,Pttde/shopware,ShopwareHackathon/dompdf,ShopwareHackathon/scale-commerce-ongr-bundle,Zwilla/shopware,ShopwareHackathon/shopware-ajax-variant,ahoehne/shopware-4,jenalgit/shopware,jenalgit/shopware,Zwilla/shopware,kayyyy/shopware-4,Pttde/shopware,arvatis/shopware,jenalgit/shopware,giginos/shopware,OliverZachau/shopware-4,xabbuh/shopware,ShopwareHackathon/dompdf,simkli/shopware,xabbuh/shopware,dnoegel/shopware-aop,dNovo/shopware,egoistIT/shopware,JonidBendo/shopware,Sunchairs/shopware,cyberid41/shopware,ShopwareHackathon/shopware-ajax-variant,wolv-dev/shopware,zeroseven/shopware,jochenmanz/shopware,ShopwareHackathon/shopware_media,DerRidda/shopware,fegoulart/shopware,dNovo/shopware,philippmahlow/shopware,SvenHerrmann/shopware,k10r/shopware,Sunchairs/shopware,VIISON/shopware-4,t2oh4e/shopware,oktupol/shopware,wesolowski/shopware,wolv-dev/shopware,arvatis/shopware,k10r/shopware,s-haase/shopware,ShopwareHackathon/shopware_media,jochenmanz/shopware,Pttde/shopware,b3nl/shopware,buddhaCode/shopware,cyberid41/shopware,zeroseven/shopware,patricktreiber/shopware_test,jochenmanz/shopware,Sunchairs/shopware,s-haase/shopware,ShopwareHackathon/dompdf,Sunchairs/shopware,wesolowski/shopware,OliverZachau/shopware-4,dNovo/shopware,dnoegel/shopware-aop,buddhaCode/shopware,oktupol/shopware,JonidBendo/shopware,arvatis/shopware,patricktreiber/shopware_test,ShopwareHackathon/shopware-ajax-variant,fegoulart/shopware,simkli/shopware,ShopwareHackathon/shopware-ajax-variant,dnoegel/shopware-aop,ahoehne/shopware-4,FiveDigital/shopware,ShopwareHackathon/shopware_search_optimization,mreiss/shopware,NetInventors/shopware,VIISON/shopware-4,buddhaCode/shopware,wolv-dev/shopware,simkli/shopware,giginos/shopware,ShopwareHackathon/shopware_media,richardbruse/shopware,k10r/shopware,SvenHerrmann/shopware,wesolowski/shopware,FiveDigital/shopware,NetInventors/shopware,patricktreiber/shopware_test,NetInventors/shopware,mreiss/shopware,ShopwareHackathon/shopware-ajax-variant,wesolowski/shopware,ShopwareHackathon/shopware_search_optimization,egoistIT/shopware,jhit/shopware,bcremer/shopware,jenalgit/shopware,xabbuh/shopware,kayyyy/shopware-4,b3nl/shopware,mreiss/shopware,dnoegel/shopware-aop,NetInventors/shopware,ShopwareHackathon/shopware_search_optimization,xabbuh/shopware,buddhaCode/shopware,FiveDigital/shopware,jochenmanz/shopware,kayyyy/shopware-4,jhit/shopware,jochenmanz/shopware,Pttde/shopware,t2oh4e/shopware,cyberid41/shopware,bcremer/shopware,SvenHerrmann/shopware,Sunchairs/shopware,ShopwareHackathon/shopware_search_optimization,egoistIT/shopware,Zwilla/shopware,jhit/shopware,DerRidda/shopware,ShopwareHackathon/scale-commerce-ongr-bundle,zeroseven/shopware,mreiss/shopware,FiveDigital/shopware,ShopwareHackathon/shopware_media,richardbruse/shopware,wesolowski/shopware,richardbruse/shopware,richardbruse/shopware,bcremer/shopware,giginos/shopware,b3nl/shopware,t2oh4e/shopware,dNovo/shopware,giginos/shopware,fegoulart/shopware,ahoehne/shopware-4,JonidBendo/shopware,VIISON/shopware-4,zeroseven/shopware,philippmahlow/shopware,Pttde/shopware,oktupol/shopware,ShopwareHackathon/scale-commerce-ongr-bundle,DerRidda/shopware,SvenHerrmann/shopware,patricktreiber/shopware_test,jhit/shopware,wolv-dev/shopware,s-haase/shopware,OliverZachau/shopware-4,OliverZachau/shopware-4,DerRidda/shopware,ShopwareHackathon/shopware_media,oktupol/shopware,kayyyy/shopware-4,patricktreiber/shopware_test,simkli/shopware,philippmahlow/shopware,t2oh4e/shopware,k10r/shopware,fegoulart/shopware,Zwilla/shopware,buddhaCode/shopware,egoistIT/shopware,ShopwareHackathon/dompdf,giginos/shopware,jhit/shopware,philippmahlow/shopware,JonidBendo/shopware,dNovo/shopware,b3nl/shopware,cyberid41/shopware,ShopwareHackathon/shopware_search_optimization,Zwilla/shopware,ShopwareHackathon/scale-commerce-ongr-bundle,t2oh4e/shopware,richardbruse/shopware,s-haase/shopware,VIISON/shopware-4,DerRidda/shopware,NetInventors/shopware,FiveDigital/shopware,k10r/shopware,jenalgit/shopware,bcremer/shopware,JonidBendo/shopware,zeroseven/shopware,ahoehne/shopware-4,cyberid41/shopware,wolv-dev/shopware,philippmahlow/shopware,egoistIT/shopware,kayyyy/shopware-4,s-haase/shopware