Merge proposals dependent on lp://qastaging/~ubuntu-manual/ubuntu-manual/maverick-do-not-use

1. maverick-do-not-use
2. Dependent merge proposals