some Small Fixes
Merge branch '2.3' of git://github.com/networking/init-cms-bundle into 2.3

. Updating from 2.3