Optimization by reducing lazyloads on the product
Fixes default value optimisation
Merge branch 'master' into fix/PIM-2015
Merge branch 'master' into fix/PIM-2015
Reduce call to database to get locale code as we already have it
Fixes call to LocaleHelper
Fixes CS
Revert "Reduce call to database to get locale code as we already have it"

This reverts commit 51b4168adfc9d5a9f0c70de3b219d41a478a6bd9.
Revert "Fixes call to LocaleHelper"

This reverts commit 0fc6d96204c57b6fbd1e6a2640ddd52fd217c5ff.
Merge pull request #760 from akeneo/fix/PIM-2015

Fix/pim 2015