Holcim and Lafarge have agreed new terms for a mega merger that is expected to create the world's biggest construction materials group.