Merge proposals dependent on lp://staging/~asommer/ubuntu-docs/serverguide

lp://staging/~asommer/ubuntu-docs/serverguide has no merge proposals.