Merge proposals dependent on lp:~michael.nelson/ubuntu-webcatalog/987838-no-screenshots-for-extras-2

1. 987838-no-screenshots-for-extras-2
2. Dependent merge proposals