Merge proposals dependent on lp://qastaging/~daniel-watkins-credativ/poweremail/fix-server-actions

1. fix-server-actions
2. Dependent merge proposals