Updated ZeroPortal to master

Change-Id: I65aee1023958399c6b22770a9b81c832413a31dd
Merge "Updated ZeroPortal to master" into wmf/1.25wmf2