Merge proposals dependent on lp://qastaging/~brandontschaefer/xapian/cjk-support-patch

lp://qastaging/~brandontschaefer/xapian/cjk-support-patch has no merge proposals.