PLA-833 PLA-989 fix for suggestions broking editor
Merge branch 'PLA-833' into release-197-pla-989-suggestions-editor-fix
PLA-833 PLA-989 restoring changes
Merge branch 'PLA-833' into release-197-pla-989-suggestions-editor-fix
Merge pull request #2151 from Wikia/release-197-pla-989-suggestions-editor-fix

Release 197 pla 989 suggestions editor fix