svn merge -c 1580013 from trunk for merging site.xml (missing from previous commit)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580018 13f79535-47bb-0310-9956-ffa450edef68