HDFS-5821. TestHDFSCLI fails for user names with the dash character. (Contributed by Gera Shegalov)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1573076 13f79535-47bb-0310-9956-ffa450edef68
HDFS-5956. A file size is multiplied by the replication factor in 'hdfs oiv -p FileDistribution' option. Contributed by Akira Ajisaka.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1573078 13f79535-47bb-0310-9956-ffa450edef68
YARN-1760. Addendum patch. TestRMAdminService assumes Capacity Scheduler.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1573134 13f79535-47bb-0310-9956-ffa450edef68
Merge remote-tracking branch: upstream/trunk