HIVE-6828: Hive tez bucket map join conversion interferes with map join conversion (Vikram Dixit K via Gunther Hagleitner)

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