Merge proposals dependent on lp://qastaging/~mhr3/libunity/fix-940161

lp://qastaging/~mhr3/libunity/fix-940161 has no merge proposals.