Merge proposals dependent on lp://qastaging/~fginther/livecd-rootfs/xenial-proposed-fix-pollinate-install

1. xenial-proposed-fix-pollinate-install
2. Dependent merge proposals