On the explore-wc branch:

Bring up to date with trunk.

Resolved conflicts in entries.c with an #ifdef FROM_TRUNK around the code
sitting on trunk, which we aren't using in this branch (calls to the old
functions to read/write 'entries').


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/explore-wc@875995 13f79535-47bb-0310-9956-ffa450edef68