Stop using ckeditor module and use wysiwyg instead.
Fix merge mess-up on modules/contrib/jquery_update/