YARN-7270 addendum: Reapplied changes after YARN-3926 backports
3 files changed