Merge proposals dependent on lp://qastaging/~codyshepherd/livecd-rootfs/xenial-proposed-resolvconf

1. xenial-proposed-resolvconf
2. Dependent merge proposals