merged

Test Plan:
<see below>

# --
# For 'Test Plan:', list the commands you ran or process you
#   followed to test this change.
# If this commit is adding to an existing review, delete the
# 'Test Plan:' lines and replace them with 'Review: Kxxx'.
For pulling. Minor changes in ckeditor and config.

Test Plan:
<see below>

# --
# For 'Test Plan:', list the commands you ran or process you
#   followed to test this change.
# If this commit is adding to an existing review, delete the
# 'Test Plan:' lines and replace them with 'Review: Kxxx'.
rebuilt editor

Test Plan:
<see below>

# --
# For 'Test Plan:', list the commands you ran or process you
#   followed to test this change.
# If this commit is adding to an existing review, delete the
# 'Test Plan:' lines and replace them with 'Review: Kxxx'.
Fixed custom plugin bugs in article editor. Changes were is wrong directory

Test Plan:
1. Opened articles in the editor.
2. Throughly tested custom plugin functionality.
3. Saved and checked that saved properly.

# --
# For 'Test Plan:', list the commands you ran or process you
#   followed to test this change.
# If this commit is adding to an existing review, delete the
# 'Test Plan:' lines and replace them with 'Review: Kxxx'.
Adding captions to images.

Test Plan:
We tested

# --
# For 'Test Plan:', list the commands you ran or process you
#   followed to test this change.
# If this commit is adding to an existing review, delete the
# 'Test Plan:' lines and replace them with 'Review: Kxxx'.