Merge branch 'master' into merge_from_sf_standard

Conflicts:
	composer.json
	ezpublish/EzPublishKernel.php
	ezpublish/config/config_test.yml