- Update tooling to support revised testing guide (PR #20697). - Require jasmine upgrade for examples that use marble testing. - Copy `cli/package.json` to `testing/` and add `jasmine-marbles`. - Resolve merge conflicts created by `NgModules` guides. PR Close #20165