HADOOP-8886. Merge r1395820 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485304 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4298. StorageRetentionManager spews warnings when used with QJM. Contributed by Aaron T. Myers.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485375 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/branch-2' into branch-2-gd
Merge remote branch 'origin/branch-2-gd' into fb-YAHOO-260-branch-2-gd