Merge pull request #319 from TheBlueMatt/2019-03-htlc-sorting