LPS-39262 + LPS-36588

http://issues.liferay.com/browse/LPS-39262
http://issues.liferay.com/browse/LPS-36588

Related Pull: https://github.com/liferay/ckeditor-ee/pull/1