PIM-3185 #comment remove the fixed mysql socket location
PIM-3185 #comment CHANGELOG update
Merge pull request #1504 from akeneo/PIM-3185

Pim 3185
Merge branch 'master' into ass/jc

* master:
  PIM-3185 #comment CHANGELOG update
  PIM-3185 #comment remove the fixed mysql socket location

Conflicts:
	CHANGELOG.md