Merge proposals dependent on lp://staging/~cjwatson/launchpad/snap-request-build-select-channels

1. snap-request-build-select-channels
2. Dependent merge proposals