HIVE-5596 : hive-default.xml.template is invalid (Killua Huang via Navis)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1534522 13f79535-47bb-0310-9956-ffa450edef68
HIVE-5597 : Temporary fix for HIVE-5172 (possible NPE in TUGIContainingTransport) (agate via Navis)

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