Merge pull request #2571 from davidcaseria/htlc-descriptor-writeable