Mexican government, Grupo Mexico agree deal over railway dispute