PIM-1647 Fixed error display in the mass edit wizard
Merge branch 'master' into feature/PIM-1740
Updated changelog