Merge branch 'master' into ao-past-session-slashing-companion

* master:
  Companion for #13624 (#2354)
  Introduce Fellowship into Collectives (#2186)
  NFTs 2.0 on Statemine (#2314)
  Bump assert_cmd from 2.0.8 to 2.0.10 (#2341)
  Bump clap from 4.1.8 to 4.1.11 (#2352)
  Companion for substrate #13312: Rename `Deterministic` to `Enforce` (#2350)
  [Companion #13634] keystore overhaul (iter) (#2345)
  Revert #2304 (#2349)
  Deprecate Currency: Companion for #12951 (#2334)
  Bump ci-linux image for rust 1.68
  Always pass port to jsonrpsee WebSocket client (#2339)
  bump zombienet to v1.3.40 (#2348)
  Improve build times by disabling wasm-builder in `no_std` (#2308)
  Bump toml from 0.7.2 to 0.7.3 (#2340)
  Bump serde from 1.0.152 to 1.0.156 (#2329)
  Parachains should charge for proof size weight (#2326)
  dmp-queue: Store messages if already processed more than the maximum (#2343)
  [Companion  #13615] Keystore overhaul (#2336)
  Bump quote from 1.0.23 to 1.0.26 (#2331)

.gitlab-ci.yml

@@ -26,10 +26,10 @@ variables:
   GIT_STRATEGY: fetch
   GIT_DEPTH: 100
   CARGO_INCREMENTAL: 0
-  CI_IMAGE: "paritytech/ci-linux:production"
+  CI_IMAGE: "paritytech/ci-linux@sha256:7c76c3f9639f919447abbf9db535588178fde4df583d6926444d44cc20c094e6" # staging 2023-03-20
   DOCKER_OS: "debian:stretch"
   ARCH: "x86_64"
-  ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.37"
+  ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.40"
 
 .common-before-script:
   before_script: