Fix for mixed native queries

It is grouping by root entity instead of keeping both of them.

This brings back some old commented code that fixed this issue => https://github.com/doctrine/doctrine2/blob/2.4/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php#L569

http://www.doctrine-project.org/jira/browse/DDC-3084