Merge proposals dependent on lp://qastaging/~didrocks/unity/fix-gerror-import

lp://qastaging/~didrocks/unity/fix-gerror-import has no merge proposals.