Merge pull request #1363 from TheBlueMatt/2022-03-tx-conf-ordering-lock-delay