Merge pull request #2219 from benthecarman/custom-closing-address

Add ability to set shutdown script when closing channel

diff --cc lightning/src/ln/channel.rs
Simple merge

diff --cc lightning/src/ln/channelmanager.rs
Simple merge

diff --cc lightning/src/ln/shutdown_tests.rs
index aeba82b1cd0bc6fd54a1bba4583591a37d5848f7,3fe729b5e08b047b7a3f3e14700864919cc94b3c..28831e5b23eea0a6fa5a8b2f092a017cac120dab
--- 1/lightning/src/ln/shutdown_tests.rs
--- 2/lightning/src/ln/shutdown_tests.rs
+++ b/lightning/src/ln/shutdown_tests.rs
@@@ -31,8 -31,10 +31,9 @@@ use bitcoin::util::address::WitnessVers
  use regex;
  
  use core::default::Default;
+ use std::convert::TryFrom;
  
  use crate::ln::functional_test_utils::*;
 -use crate::ln::msgs::OptionalField::Present;
  
  #[test]
  fn pre_funding_lock_shutdown_test() {