Merge proposals dependent on lp:~ken-vandine/friends/fix-facebook-name

lp:~ken-vandine/friends/fix-facebook-name has no merge proposals.