Expiring HTLCs without free relay

[instagibbs]

@josh

As for grinding and rebroadcasting, I had hoped that this proposal would make those unnecessary,

I still think it still would be a Good Idea for robustness and defense-in-depth to relay failures/games.