HIVE-8006 CBO Trunk Merge: Test fail that includes Table Sample, rows(), query hints (Harish Butani via John Pullokkaran)

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