Handle merging of codeshare flights
Also, make MergeUtil::isSameFlight internal, as the semantics now depend on the caller checking for matching booking references for this to be correct.