Merge proposals dependent on lp:~elopio/snapcraft/fix-pep8-and-doc-indentation

lp:~elopio/snapcraft/fix-pep8-and-doc-indentation has no merge proposals.