Merge branch 'ben-add-metadata-to-sc-consensus' of github.com:paritytech/substrate into ben-add-metadata-to-sc-consensus