HIVE-8232: CBO Trunk Merge: Address Review Comments (Laljo John Pullokkaran via Gunther Hagleitner)

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