Snappy playpen

Merge proposals dependent on lp://qastaging/~3v1n0/snappy-playpen/hello-unity-fixes

  1. hello-unity-fixes
  2. Dependent merge proposals

lp://qastaging/~3v1n0/snappy-playpen/hello-unity-fixes has no merge proposals.