Update to latest master & master (#260)

cumulus/test/service/src/lib.rs

@@ -423,6 +423,7 @@ pub fn node_config(
 		base_path: Some(base_path),
 		informant_output_format: Default::default(),
 		wasm_runtime_overrides: None,
+		disable_log_reloading: false,
 	})
 }
 

cumulus/test/service/tests/integration.rs

@@ -22,7 +22,7 @@ use substrate_test_runtime_client::AccountKeyring::*;
 
 #[substrate_test_utils::test]
 async fn test_collating_and_non_collator_mode_catching_up(task_executor: TaskExecutor) {
-	sc_cli::init_logger("", Default::default(), None).expect("Sets up logger");
+	sc_cli::init_logger("", Default::default(), None, false).expect("Sets up logger");
 
 	let para_id = ParaId::from(100);