PIG-3494: Several fixes for e2e tests

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