ZeroPortal ext to master

Change-Id: I0e1d44f16306146b874e25873ae491c4b954a9db
Merge "ZeroPortal ext to master" into wmf/1.24wmf21