update the configuration file
remove the config file from the bundle
update the cms
update the networking/init-cms-bundle
revert to default app setup to avoid issue with 'DELETE' request method
Merge branch 'refs/heads/master' into 2.3

Conflicts:
	composer.lock