Merge remote-tracking branch 'origin/master' into cecton-getting-conf…

…iguration-from-cmd

client/cli/src/lib.rs

@@ -489,6 +489,7 @@ impl<'a> ParseAndPrepareExport<'a> {
 			self.version,
 			None,
 		)?;
+		fill_config_keystore_in_memory(&mut config)?;
 
 		if let DatabaseConfig::Path { ref path, .. } = &config.database {
 			info!("DB path: {}", path.display());