Merge proposals dependent on lp://staging/~chris.gagnon/cupstream2distro-config/unity-stack-update

1. unity-stack-update
2. Dependent merge proposals