HIVE-4932 PTFOperator fails resetting PTFPersistence (Navis Ryu via egc)

Submitted by:	Navis Ryu
Reviewed by:	Edward Capriolo


git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1507186 13f79535-47bb-0310-9956-ffa450edef68
HIVE-3756 : LOAD DATA does not honor permission inheritence (Chaoyu Tang via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1507188 13f79535-47bb-0310-9956-ffa450edef68
HIVE-4935 : Potential NPE in MetadataOnlyOptimizer (Yin Huai via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1507342 13f79535-47bb-0310-9956-ffa450edef68
HIVE-3632 : Upgrade datanucleus to support JDK7 (Xuefu Zhang via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1507354 13f79535-47bb-0310-9956-ffa450edef68
HIVE-4878 : With Dynamic partitioning, some queries would scan default partition even if query is not using it. (Laljo John Pullokkaran via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1507357 13f79535-47bb-0310-9956-ffa450edef68
HIVE-4927 : When we merge two MapJoin MapRedTasks, the TableScanOperator of the second one should be removed (Yin Huai via Ashutosh Chauhan)

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

Conflicts:
	ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/CommonJoinTaskDispatcher.java
	ql/src/test/results/clientpositive/multiMapJoin1.q.out