TinyMCE: When adding a caption to an image that is in a paragraph with other text, move the caption node above the paragraph instead of below.

Merges [28190] to the 3.9 branch.

props azaozz.
fixes #27922.

Built from https://develop.svn.wordpress.org/branches/3.9@28231


git-svn-id: http://core.svn.wordpress.org/branches/3.9@28059 1a063a9b-81f0-0310-95a4-ce76da25c4cd
TinyMCE: fix the "active" state of the Link button when an image wrapped in a link is selected.

Merges [28185] to the 3.9 branch.

props azaozz.
fixes #27847.

Built from https://develop.svn.wordpress.org/branches/3.9@28232


git-svn-id: http://core.svn.wordpress.org/branches/3.9@28060 1a063a9b-81f0-0310-95a4-ce76da25c4cd