PIG-3468: PIG-3123 breaks e2e test Jython_Diagnostics_2

git-svn-id: https://svn.apache.org/repos/asf/pig/trunk@1526051 13f79535-47bb-0310-9956-ffa450edef68
PIG-3360: Some intermittent negative e2e tests fail on hadoop 2

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