Bogota, rebels reach deal on those missing in Colombia conflict