HIVE-5773 - Fix build due to conflict between HIVE-5711 and HIVE-5713

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