HIVE-5178 : Wincompat : QTestUtil changes (Sushanth Sowmyan via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1527350 13f79535-47bb-0310-9956-ffa450edef68
HIVE-4837 : Union on void type fails with NPE (Navis via Ashutosh Chauhan)

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