Update VE to head of wmf/1.22wmf16 VE branch

Change-Id: I57dbbc1755d4744d47462e385a7a44639b566cb5