[merge][#293440] apply Martin's fix for `Cannot commit to bound svn branch: "invalid property value 'branch-nick' for None"`

[Martin Pool]

I'll also merge this to 1.9 for a 1.9.1 release.

-- 
Martin <http://launchpad.net/~mbp/>