JsonConfig,ZeroBanner,ZeroPortal to master

Change-Id: Idf5ce2605ca9b4741f4374af47a5f4e30b49024c