Import fixes

Updated version of https://github.com/doctrine/DoctrineBundle/pull/240