HIVE-8228 : CBO: fix couple of issues with partition pruning (Harish Butani via Ashutosh Chauhan)

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