HIVE-7985: With CBO enabled cross product is generated when a subquery is present (Laljo John Pullokkaran, reviewed by Ashutosh Chauhan)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1633733 13f79535-47bb-0310-9956-ffa450edef68
HIVE-8549: NPE in PK-FK inference when one side of join is complex tree (Prasanth J via Gunther Hagleitner)

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