Updated ZeroBanner & Portal to master

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