Update VisualEditor with cherry-pick for wmf14 branch

Change-Id: Ie800ec0c328c0c6b46aeead215159f01988d465c