HIVE-4677 WebHCat e2e tests fail on Hadoop 2 (daijy via gates)


git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1505854 13f79535-47bb-0310-9956-ffa450edef68
HIVE-4502 : NPE - subquery smb joins fails (Navis via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1505870 13f79535-47bb-0310-9956-ffa450edef68
HIVE-4875 : hive config template is not parse-able due to angle brackets in description (Sergey Shelukhin via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1505873 13f79535-47bb-0310-9956-ffa450edef68
HIVE-4677 WebHCat e2e tests fail on Hadoop 2 (Fix checkstyle failure)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1505894 13f79535-47bb-0310-9956-ffa450edef68
HIVE-4677 WebHCat e2e tests fail on Hadoop 2 (Fix checkstyle failure)

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

Conflicts:
	ql/src/test/results/clientpositive/correlationoptimizer3.q.out
	ql/src/test/results/clientpositive/correlationoptimizer6.q.out
	ql/src/test/results/clientpositive/correlationoptimizer7.q.out