Resolves discriminator map on ORM mapping

This commit depends on https://github.com/doctrine/doctrine2/pull/1130