Merge remote-tracking branch 'origin/master' into cyclical-deps

# Conflicts:
#	rust/src/utils.rs

Author: vsubhuman

rust/json-gen/src/main.rs

@@ -7,7 +7,6 @@ use cardano_serialization_lib::crypto::*;
 use cardano_serialization_lib::metadata::*;
 use cardano_serialization_lib::plutus::*;
 use cardano_serialization_lib::utils::*;
-use crate::tx_builder::tx_inputs_builder::{PlutusWitness, PlutusWitnesses};
 
 //#[macro_export]
 macro_rules! gen_json_schema {
@@ -156,8 +155,5 @@ fn main() {
     gen_json_schema!(BigInt);
     gen_json_schema!(Int);
     gen_json_schema!(Value);
-
-    // tx_builder.rs
-    gen_json_schema!(PlutusWitness);
-    gen_json_schema!(PlutusWitnesses);
+    gen_json_schema!(TransactionUnspentOutput);
 }