VE-1736: Code changes for new default editor
Merge pull request #5781 from Wikia/VE-1736

VE-1736: Code changes for new default editor