Update VisualEditor to wmf21 branch for cherry-picks

Change-Id: I23f5ac0b3beeeedc361512d95746b5a2736965fe