Unity

Merge proposals dependent on lp://qastaging/~townsend/unity/fix-waiting-to-install

  1. fix-waiting-to-install
  2. Dependent merge proposals

lp://qastaging/~townsend/unity/fix-waiting-to-install has no merge proposals.