cleanup id strategy logic and validation step. fix PHPCR-60
Merge pull request #351 from doctrine/finalize-mapping-cleanup

cleanup id strategy logic and validation step