Unity

Merge proposals dependent on lp://staging/~didrocks/unity/fix-tests-with-latest-glib-unity7

  1. fix-tests-with-latest-glib-unity7
  2. Dependent merge proposals

lp://staging/~didrocks/unity/fix-tests-with-latest-glib-unity7 has no merge proposals.