[WIP] Feature/cli tools rebased

Based on #189 

Sync with doctrine/DoctrineModule#226