Merge pull request #1981 from Guite/1.4

updated Doctrine extensions manager to use the stof bundle, fixed #1711
cs fixes