MAPREDUCE-5316. job -list-attempt-ids command does not handle illegal task-state. Contributed by Ashwin Shankar


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1494293 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9582. Non-existent file to "hadoop fs -conf" doesn't throw error. Contributed by Ashwin Shankar


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