* Store the database in a role specific subdirectory

companion PR for https://github.com/paritytech/substrate/issues/6880

* fix test

* update Substrate

Co-authored-by: parity-processbot <>