PIG-4186: Fix e2e run against new build of pig and some enhancements (rohini)

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