Canadian government, border staff reach deal, ending strike -union