Merge "Move and re-enable test_build_configuration_branch tests" into feature/zuulv3