HIVE-5793 : Update hive-default.xml.template for HIVE4002 (Navis via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1545345 13f79535-47bb-0310-9956-ffa450edef68
HIVE-5849 Improve the stats of operators based on heuristics in the absence of any column statistics (Prasanth Jayachandran via Harish Butani)

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