Merge to the 'log-g-performance' branch outstanding trunk changes.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/log-g-performance@871032 13f79535-47bb-0310-9956-ffa450edef68