CBSA employees agree to deal with government, ending day long strike action