Merge proposals dependent on lp://qastaging/~pexego/poweremail/nan_poweremail_improvements

lp://qastaging/~pexego/poweremail/nan_poweremail_improvements has no merge proposals.