Merge from trunk. HDFS-6620. Snapshot docs should specify about preserve options with cp command. Contributed by Stephen Chu.

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