Backport fix lock (#507)

* Fix locking, from an updated Substrate (#506)

* Fix locking, from an updated Substrate

* Bump runtime version

* Lock file.

* Bump version and extra fix.
6 jobs for master in 26 minutes and 54 seconds