HDFS-5582. hdfs getconf -excludeFile or -includeFile always failed (satish via cmccabe)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1554295 13f79535-47bb-0310-9956-ffa450edef68
HDFS-5701. Fix the CacheAdmin -addPool -maxTtl option name. Contributed by Stephen Chu.

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