Fix payments_spec set up
Merge remote-tracking branch 'upstream/1-3-stable' into 3990-payments-clearing