PIG-3559: Trunk is broken by PIG-3522 (cheolsoo)


git-svn-id: https://svn.apache.org/repos/asf/pig/trunk@1538250 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk
Merge remote branch 'origin/trunk' into trunk-gd