Merge proposals dependent on lp:~andrewsomething/ubuntu-packaging-guide/fix-singlehtml-for-new-sphinx-version

1. fix-singlehtml-for-new-sphinx-version
2. Dependent merge proposals