On the authzperf branch: Finaly sync with trunk. There were no conflicts. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/authzperf@1776831 13f79535-47bb-0310-9956-ffa450edef68