Upstream merge bdd1a73eaa0978ca33722a38f707c7c1599773fa..ede7dad318318fb984449e1e7f3aacc9220b3a88
Upstream merge bdd1a73..ede7dad
Merge branch 'VE' into wikia-block-media-node

Conflicts:
	extensions/VisualEditor/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js
	extensions/VisualEditor/modules/ve/ce/ve.ce.ProtectedNode.js
	extensions/VisualEditor/modules/ve/ce/ve.ce.RelocatableNode.js