PIM-2237 : temporary fix for extra parameters
Merge branch 'master' into PIM-2237-extra-parameters
PIM-2137 : move removeExtraParameter method and ensure it's called only
for ORM implementation, we'll see with a more complete ODm one if we can
abstract this properly
PIM-2137 : fix CS
Merge pull request #867 from akeneo/PIM-2237-extra-parameters

PIM-2237 : fix for extra parameters in QB
Merge branch 'master' into PIM-1864