HIVE-5382 - PTest2 should allow you to specify ant properties which will only be added to the command when a test is executed

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1529212 13f79535-47bb-0310-9956-ffa450edef68
HIVE-5443 - Few hadoop2 .q.out needs to be updated (Ashutosh Chauhan via Brock Noland)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1529275 13f79535-47bb-0310-9956-ffa450edef68
HIVE-5115 : Webhcat e2e tests TestMapReduce_1 and TestHeartbeat_2 require changes for Hadoop 2 (Deepesh Khandelwal via Thejas Nair)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1529328 13f79535-47bb-0310-9956-ffa450edef68
HIVE-5433: Fix varchar unit tests to work with hadoop-2.1.1 (Jason Dere via Thejas Nair)

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