Merge branch 'changes_tries_update_configuration' of https://github.com/paritytech/substrate into changes_tries_update_configuration