5ca97f1e60
Committed as a YARN patch even though all the code changes are in common.
Committed as a YARN patch even though all the code changes are in common.