Merge latest trunk changes (make Pig compile after PIG-3913, plus 2 missing patches on trunk)

git-svn-id: https://svn.apache.org/repos/asf/pig/branches/tez@1597524 13f79535-47bb-0310-9956-ffa450edef68