HIVE-6349 : Column name map is broken (reviewed by Remus, Sergey)

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