Merge proposals dependent on lp:~kinggoddard/ubuntu-packaging-guide/913934-fix

lp:~kinggoddard/ubuntu-packaging-guide/913934-fix has no merge proposals.