JIT Forwards Reload Consistency 

After #1835 and #1857 we need to update the changes in 1857 which drop things from the forward_htlcs set if they've already been forwarded to include things in the to-be-intercept-forwarded set, otherwise users can accidentally forward twice if the channelmanager wasnt persisted and the original forward channel is now on chain. Should be an easy change though.