updated dependencies
fix test failure caused by test setup issue
Merge branch 'routing-cleanup' of github.com:symfony-cmf/cmf-sandbox into routing-cleanup

Conflicts:
	composer.lock