Merge -c 1383607 from trunk to branch-2. Fixes: HADOOP-8597 (add Avro support to FsShell text command).