HIVE-4991: hive build with 0.20 is broken (Edward Capriolo via Gunther Hagleitner)

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