Merge proposals dependent on lp://staging/~charles.davis/ubuntu-docs/oldsoldier-documentor

lp://staging/~charles.davis/ubuntu-docs/oldsoldier-documentor has no merge proposals.