HIVE-5879 : Fix spelling errors in hive-default.xml.template (Lefty Leverenz via Navis)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1551876 13f79535-47bb-0310-9956-ffa450edef68
HIVE-6021: Problem in GroupByOperator for handling distinct aggrgations (Sun Rui via Xuefu)

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