fix 7.x tests fail with 'remote branch not found in upstream origin' #2308639