HIVE-7915 CBO: more cost model changes (Harish Butani via John Pullokkaran)

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