Sync the 'in-repo-authz' branch with recent trunk changes. (Merged /subversion/trunk:r1423201-r1423748.)