Backport of r74429. Not merged/blocked as svnmerge.py is giving me an error and
I don't want to accidentally check in busted svnmerge metadata.
4 files changed