Combine two strings, using placeholders for filenames and avoiding HTML. see #27057.

Built from https://develop.svn.wordpress.org/trunk@27604


git-svn-id: http://core.svn.wordpress.org/trunk@27447 1a063a9b-81f0-0310-95a4-ce76da25c4cd