Merge pull request #2409 from donaldallen/2.2/develop

Revert "Fixed hard/soft return in CKEditor"