Colombia has walked back from the brink of a damaging trade war with the United States, reaching an agreement on accepting deported migrants being returned on military planes, after a flurry of threats from President Donald Trump that included steep tariffs.