Merged changes done in trunk into the branch

git-svn-id: https://svn.apache.org/repos/asf/directory/shared/branches/shared-subtree@966528 13f79535-47bb-0310-9956-ffa450edef68
6 files changed