Revert "Revert "Update VisualEditor to wmf21 for cherry-pick of I0fb47f7c91f61 and If48555fa476""

This reverts commit 59be4da09692d54a679446fc668e0bbb62cb78f6.

Change-Id: Ic19bd902d52b1c9247e25f04659f7512e690da98
Merge "Revert "Revert "Update VisualEditor to wmf21 for cherry-pick of I0fb47f7c91f61 and If48555fa476""" into wmf/1.24wmf21