Prepare 1.2.5 tag
PIM-3129: fix CS
Merge branch 'master' into merge/fixes-1.2

Conflicts:
	CHANGELOG.md
	src/Pim/Bundle/CatalogBundle/Version.php
Update changelog
Merge pull request #1558 from akeneo/merge/fixes-1.2

Merge/fixes 1.2
Merge branch 'master' into refactor/product_query_builder

Conflicts:
	CHANGELOG.md