HIVE-8086: Disable Trivial Project Removal Rule, Fix Result Schema (Laljo John Pullokkaran via Gunther Hagleitner)

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