Merge pull request #1506 from tnull/2022-05-rename-funding-locked