Merge proposals dependent on lp://qastaging/~mattgriffin/ubuntu-manual/ubuntu-one-docs

lp://qastaging/~mattgriffin/ubuntu-manual/ubuntu-one-docs has no merge proposals.