Merge of "in-portal/branches/5.2.x@16599" to "in-portal/branches/5.3.x@16597". Conflicts:
29 Jul 17 alex 16600
Fixes INP-1698 - Allow using CKEditor and CodeMirror on same textarea Differential Revision: http://qa.in-portal.org/D302
19 Jul 17 alex 16595
Got a suggestion or an issue? Discuss it on the Atlassian Community or visit Atlassian Support for other options.