HIVE-8923 : HIVE-8512 needs to be fixed also for CBO (Sergey Shelukhin, reviewed by Ashutosh Chauhan)

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