Clean up 2.x branch
Merge branch '7.x-2.x' into 25299-ckeditor-wysiwyg