Fixed #2222 (Not being able to have different discriminator values map to the same entity) by switching key and value in map

Fixed #2222 (Not being able to have different discriminator values map to the same entity) by switching key and value in map #831