Merge pull request #2660 from benthecarman/flexible-fee-rate

More flexible fee rate estimates

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

diff --cc lightning/src/util/test_utils.rs
Simple merge