Merge pull request #2197 from jbesraa/feat/lockable_score_rw

add another lock to lockable_score

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

diff --cc lightning/src/routing/router.rs
Simple merge

diff --cc lightning/src/routing/scoring.rs
Simple merge