Merge proposals dependent on lp://qastaging/~xavier-calland/do-plugins/empathy

lp://qastaging/~xavier-calland/do-plugins/empathy has no merge proposals.