Update to ckeditor 4 and Updated local 2.2 base to fix conflicts

This should be backwards compatible with the current ckeditor 3.x in pyro 2.2
replaces PR #2206