1.8.x backports

[Daniel Shahaf]

Should svn-role (the STATUS mergebot) use a 1.8 build for running 'merge'?

IIRC we discussed this before and decided we should use a 1.8 build as
soon as a 1.8.0 prerelease is available, so that's what I'll default to
doing.