Revert "Fixed hard/soft return in CKEditor"

This reverts commit a3fc6b31b8d262acdee0d29e8c8d01bf1490a27c.
Merge pull request #2409 from donaldallen/2.2/develop

Revert "Fixed hard/soft return in CKEditor"