svn merge -c 1237549 from trunk for deleting svn:mergeinfo from .gitignore and test java source files.

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