On the 'utf8-cmdline' branch: Sync with trunk, resolving minor conflicts in
svn_opt.h (left unchanged).


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/utf8-cmdline@1932345 13f79535-47bb-0310-9956-ffa450edef68