Backport installer to Doctrine conversion done in 2.0
Backport changes from 2.0