Remove incorrect bwc branch logic from master
Remove incorrect bwc branch logic from master

Commit bf007e8d936d82ed2d28c70da1a7366cfa862342 was a forward port of logic needed in 5.x to get
the correct bwc branch. However, other changes on master meant that this forward port was not
needed and actually broke the bwc tests. This change removes the incorrect if statement.

Relates #25134

uschindler/elasticsearch,mohit/elasticsearch,coding0011/elasticsearch,qwerty4030/elasticsearch,naveenhooda2000/elasticsearch,coding0011/elasticsearch,gfyoung/elasticsearch,scorpionvicky/elasticsearch,sneivandt/elasticsearch,gingerwizard/elasticsearch,rajanm/elasticsearch,rajanm/elasticsearch,brandonkearby/elasticsearch,mohit/elasticsearch,vroyer/elasticassandra,scorpionvicky/elasticsearch,LeoYao/elasticsearch,masaruh/elasticsearch,mjason3/elasticsearch,ThiagoGarciaAlves/elasticsearch,nknize/elasticsearch,sneivandt/elasticsearch,ThiagoGarciaAlves/elasticsearch,Stacey-Gammon/elasticsearch,coding0011/elasticsearch,gingerwizard/elasticsearch,kalimatas/elasticsearch,uschindler/elasticsearch,Stacey-Gammon/elasticsearch,masaruh/elasticsearch,rajanm/elasticsearch,scorpionvicky/elasticsearch,gfyoung/elasticsearch,kalimatas/elasticsearch,shreejay/elasticsearch,masaruh/elasticsearch,uschindler/elasticsearch,scottsom/elasticsearch,GlenRSmith/elasticsearch,naveenhooda2000/elasticsearch,vroyer/elassandra,lks21c/elasticsearch,gingerwizard/elasticsearch,coding0011/elasticsearch,wangtuo/elasticsearch,fred84/elasticsearch,lks21c/elasticsearch,vroyer/elasticassandra,jimczi/elasticsearch,robin13/elasticsearch,wenpos/elasticsearch,gingerwizard/elasticsearch,mohit/elasticsearch,kalimatas/elasticsearch,sneivandt/elasticsearch,markwalkom/elasticsearch,HonzaKral/elasticsearch,strapdata/elassandra,ThiagoGarciaAlves/elasticsearch,fred84/elasticsearch,jimczi/elasticsearch,lks21c/elasticsearch,gfyoung/elasticsearch,brandonkearby/elasticsearch,LeoYao/elasticsearch,umeshdangat/elasticsearch,GlenRSmith/elasticsearch,ThiagoGarciaAlves/elasticsearch,pozhidaevak/elasticsearch,s1monw/elasticsearch,strapdata/elassandra,gfyoung/elasticsearch,scorpionvicky/elasticsearch,fred84/elasticsearch,scottsom/elasticsearch,lks21c/elasticsearch,s1monw/elasticsearch,nknize/elasticsearch,mjason3/elasticsearch,lks21c/elasticsearch,qwerty4030/elasticsearch,Stacey-Gammon/elasticsearch,s1monw/elasticsearch,LeoYao/elasticsearch,maddin2016/elasticsearch,gingerwizard/elasticsearch,shreejay/elasticsearch,gingerwizard/elasticsearch,GlenRSmith/elasticsearch,GlenRSmith/elasticsearch,mohit/elasticsearch,s1monw/elasticsearch,naveenhooda2000/elasticsearch,mjason3/elasticsearch,wangtuo/elasticsearch,qwerty4030/elasticsearch,wenpos/elasticsearch,scottsom/elasticsearch,pozhidaevak/elasticsearch,LeoYao/elasticsearch,markwalkom/elasticsearch,LeoYao/elasticsearch,Stacey-Gammon/elasticsearch,brandonkearby/elasticsearch,maddin2016/elasticsearch,ThiagoGarciaAlves/elasticsearch,wangtuo/elasticsearch,markwalkom/elasticsearch,HonzaKral/elasticsearch,GlenRSmith/elasticsearch,maddin2016/elasticsearch,vroyer/elasticassandra,sneivandt/elasticsearch,robin13/elasticsearch,nezirus/elasticsearch,strapdata/elassandra,HonzaKral/elasticsearch,shreejay/elasticsearch,umeshdangat/elasticsearch,jimczi/elasticsearch,robin13/elasticsearch,naveenhooda2000/elasticsearch,vroyer/elassandra,sneivandt/elasticsearch,scorpionvicky/elasticsearch,pozhidaevak/elasticsearch,pozhidaevak/elasticsearch,jimczi/elasticsearch,coding0011/elasticsearch,nezirus/elasticsearch,umeshdangat/elasticsearch,nknize/elasticsearch,gfyoung/elasticsearch,fred84/elasticsearch,wenpos/elasticsearch,robin13/elasticsearch,brandonkearby/elasticsearch,markwalkom/elasticsearch,nezirus/elasticsearch,strapdata/elassandra,nknize/elasticsearch,masaruh/elasticsearch,masaruh/elasticsearch,mjason3/elasticsearch,kalimatas/elasticsearch,mjason3/elasticsearch,rajanm/elasticsearch,rajanm/elasticsearch,nezirus/elasticsearch,vroyer/elassandra,gingerwizard/elasticsearch,brandonkearby/elasticsearch,LeoYao/elasticsearch,s1monw/elasticsearch,umeshdangat/elasticsearch,uschindler/elasticsearch,uschindler/elasticsearch,scottsom/elasticsearch,qwerty4030/elasticsearch,rajanm/elasticsearch,wenpos/elasticsearch,ThiagoGarciaAlves/elasticsearch,pozhidaevak/elasticsearch,wangtuo/elasticsearch,mohit/elasticsearch,naveenhooda2000/elasticsearch,Stacey-Gammon/elasticsearch,strapdata/elassandra,umeshdangat/elasticsearch,maddin2016/elasticsearch,HonzaKral/elasticsearch,shreejay/elasticsearch,wenpos/elasticsearch,kalimatas/elasticsearch,wangtuo/elasticsearch,nezirus/elasticsearch,nknize/elasticsearch,qwerty4030/elasticsearch,maddin2016/elasticsearch,markwalkom/elasticsearch,jimczi/elasticsearch,LeoYao/elasticsearch,markwalkom/elasticsearch,scottsom/elasticsearch,shreejay/elasticsearch,robin13/elasticsearch,fred84/elasticsearch