More robust escaping in the plugin/theme upgrader.

Merges [24474] to the 3.5 branch.



git-svn-id: https://core.svn.wordpress.org/branches/3.5@24475 1a063a9b-81f0-0310-95a4-ce76da25c4cd