Merge proposals dependent on lp://qastaging/~walterorlin/ubuntu-manual/documentclassupstreamfix

1. documentclassupstreamfix
2. Dependent merge proposals