HIVE-5166 : TestWebHCatE2e is failing intermittently on trunk (Eugene Koifman via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1524441 13f79535-47bb-0310-9956-ffa450edef68
HIVE-5310 futurama-episodes

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