HIVE-7095 : Fix test fails for both hadoop-1 and hadoop-2 (Navis via Ashutosh Chauhan)

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

Conflicts:
	itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
	ql/src/java/org/apache/hadoop/hive/ql/Driver.java
	ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
	ql/src/java/org/apache/hadoop/hive/ql/exec/mr/HadoopJobExecHelper.java
	ql/src/test/results/clientnegative/unset_table_property.q.out
	ql/src/test/results/clientpositive/bucketizedhiveinputformat.q.out
	ql/src/test/results/clientpositive/groupby_sort_1.q.out
	ql/src/test/results/clientpositive/groupby_sort_skew_1.q.out
	ql/src/test/results/clientpositive/nullformatCTAS.q.out
	ql/src/test/results/clientpositive/show_create_table_alter.q.out
	ql/src/test/results/clientpositive/show_tblproperties.q.out
	ql/src/test/results/clientpositive/unset_table_view_property.q.out