Switch json plugin to updated location
Update all submodules to latest upstream HEAD revision