YARN-6143. Fix incompatible issue caused by YARN-3583. (Sunil G via wangda)

(cherry picked from commit 0566b30875dfc61dbbba4cde0d42e15b116e85b8)
(cherry picked from commit 920847edcef57c71651dc66b6c11cf9fbd13e6da)
18 files changed