EJPLUGIN-169: make sure to pass correct wizard id’s
Merge branch 'master' into rc2.1.0