On the 'apply-processor' branch: replay r1922347 from 'trunk', marking it as
merged.

This is a follow-up to r1922333 (regarding apply-processor), which is similar
to r1922266 (this revision has been committed to trunk). So complicated...

* Revert changes in record_skip() and record_tree_conflict() functions.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/apply-processor@1922348 13f79535-47bb-0310-9956-ffa450edef68