Merge pull request #2622 from wpaulino/funding-and-commitment-tx-confirm-same-block