Merge 1529369 from trunk to branch-2 for YARN-1251. TestDistributedShell#TestDSShell failed with timeout. Contributed by Xuan Gong.