India and Canada agreed to return ambassadors to each other's capitals, turning the page on a bitter spat over an assassination as Canada's new leader welcomed Prime Minister Narendra Modi.