HADOOP-10683. Merging change r1602991 from trunk to branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602994 13f79535-47bb-0310-9956-ffa450edef68
HDFS-6539. test_native_mini_dfs is skipped in hadoop-hdfs pom.xml (decstery via cmccabe)

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