TEZ-1700. Replace containerId from TaskLocationHint with [TaskIndex+Vertex] based affinity (bikas)
(cherry picked from commit 74c7f874d558f933fbf9697c537d204eb56806c9)