Update VisualEditor for cherry-picks in wmf/1.22wmf17 branch

Change-Id: Iee8e4e19f126feda130653fc0719b54b3e17a9d2