HIVE-7364 : Trunk cannot be built on -Phadoop1 after HIVE-7144 (Navis reviewed by Jason Dere)

git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1608975 13f79535-47bb-0310-9956-ffa450edef68
HIVE-7308: Show auto-parallelism in extended explain (Gunther Hagleitner, reviewed by Vikram Dixit K)

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