Merge "Allow github trigger to match on branches/refs" into feature/zuulv3