Merge proposals dependent on lp://qastaging/~divmod-dev/divmod.org/branchmgr-windows-3001

lp://qastaging/~divmod-dev/divmod.org/branchmgr-windows-3001 has no merge proposals.