HIVE-6668 When auto join convert is on and noconditionaltask is off, ConditionalResolverCommonJoin fails to resolve map joins. (Navis Ryu via Harish Butani)

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