Merge proposals dependent on lp://qastaging/~macslow/libunity/libunity.fix-841902

lp://qastaging/~macslow/libunity/libunity.fix-841902 has no merge proposals.