Update VisualEditor to wmf2 branch for cherry-pick

Change-Id: Id2138bd1949f955c2317da819e86735ebe038a43