Striking Canadian border agents reach deal on salaries, work environment