TEZ-1689. addendum - fix unit test failure. (zjffdu)
TEZ-1666. UserPayload should be null if the payload is not specified.
(sseth)
TEZ-1699. Vertex.setParallelism should throw an exception for invalid invocations (bikas)
TEZ-1700. Replace containerId from TaskLocationHint with [TaskIndex+Vertex] based affinity (bikas)