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

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