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
Merge remote branch 'origin/trunk' into trunk-gd