HIVE-4708 : Fix TestCliDriver.combine2.q on 0.23 (Brock Noland via Navis)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1492027 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd
Merge remote branch 'origin/trunk-gd' into fb-ANT-REFACTORED-plus-GEN-TESTS-SPLIT-RELATIVE-trunk-gd