All CBSA agents to carry batons, pepper spray when working with detained migrants