Merge proposals dependent on lp://qastaging/~vjsamuel/drizzle/more-doc-fixes

lp://qastaging/~vjsamuel/drizzle/more-doc-fixes has no merge proposals.