Merge branch 'hotfix/2.1.2'
Rename db.orm as doctrine.orm.entity_manager, sync with symfony.
Merge branch 'hotfix/2.1.3' into develop