Update VisualEditor with cherry-pick for wmf13 branch

Change-Id: I861e67819248c27da8770d7c413ba82879e82b97
Merge "Update VisualEditor with cherry-pick for wmf13 branch" into wmf/1.22wmf13