Merge branch 'Issue-2378919' into 7.x-1.x
Issue #2379247 by eshta: Provide configuration regarding stripping out inline styles from edit in context HTML.
Merge branch 'Issue-2379247' into RC