HIVE-4748 - Fix TempletonUtilsTest failure on Windows (Shuaishuai Nie via Thejas Nair)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1519915 13f79535-47bb-0310-9956-ffa450edef68
HIVE-5197: TestE2EScenerios.createTaskAttempt should use MapRedUtil (Brock Noland via Thejas Nair)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1519916 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd