HDFS-4848. copyFromLocal and renaming a file to .snapshot should output that .snapshot is a reserved name. Contributed by Jing Zhao

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1487942 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9607. Fixes in Javadoc build. Contributed by Timothy St. Clair

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1487979 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9605. Update junit dependency. Contributed by Timothy St. Clair.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1487980 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd
Merge remote branch 'origin/trunk-gd' into fb-HDFS-4310-trunk-gd