Merge proposals dependent on lp://qastaging/~3v1n0/u1db-qt/doc-path-change-fixes

lp://qastaging/~3v1n0/u1db-qt/doc-path-change-fixes has no merge proposals.