Updating zero & jsonconfig exts to master

Change-Id: Id31e85960fa34707348c32cafb1a7d64388936d2