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

This reverts commit 9f4e9d6b075c698f3eb561d6caada76ed42a144a.

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