cherry-pick-votes: Fix XML encoding

Also improve formatting where descriptions are long.