Updating zero & jsonconfig exts to master

Change-Id: I8e5bd3950716d79c3662ae691a9ec2eca0a63e17