TEZ-722. Tez trunk doesn't compile against latest branch-2. (Jonathan Eagles via hitesh)