Mexican baker Grupo Bimbo said a lockout of workers at its Canada Bread production facility in Langley, British Columbia, has ended after agreeing new pay and conditions terms with union leaders.