Merge pull request #647 from valentinewallace/test-remote-fee-spike-buffer-violation

Test remote fee spike buffer violation

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

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

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