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