HIVE-4067 : Followup to HIVE-701: reduce ambiguity in grammar (Samuel Yuan via Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1464808 13f79535-47bb-0310-9956-ffa450edef68
Merge remote-tracking branch 'apache/trunk' into HIVE-4278_publish_local
updates