Integrate weight v1.5 changes

- https://github.com/paritytech/substrate/pull/12138
- https://github.com/paritytech/substrate/pull/10918

See: https://forum.polkadot.network/t/weight-v2-discussion-and-updates/227