The two countries had been locked in years of diplomatic spats after the retaliatory arrests of each others' citizens and a ...