Updated ZeroBanner & Portal to master

Change-Id: I29644d348b6e12ce3c83a17aabb15716264e9a64
Merge "Updated ZeroBanner & Portal to master" into wmf/1.25wmf10