Update develop with master #2659

Job	Run time
lint	1m 10s
test (api)	10m 37s
test-2_5 (block-zero-handling)	1m 31s
test (bns)	3m 25s
test-2_5 (faucet-stx)	1m 20s
test (bns-e2e)	7m 7s
test-rosetta (rosetta)	3m 9s
test-2_5 (pox-4-btc-address-formats)	2m 11s
test (btc-faucet)	1m 36s
test-rosetta (rosetta-construction)	2m 39s
test-2_5 (pox-4-delegate-aggregation)	2m 4s
test (event-replay)	2m 13s
test-rosetta (rosetta-cli-data)	2m 6s
test (rpc)	1m 37s
test-rosetta (rosetta-cli-construction)	2m 33s
test-2_5 (pox-4-delegate-stacking)	1m 55s
test-2_5 (pox-4-delegate-revoked-stacking)	2m 4s
test-2_5 (pox-4-stack-extend-increase)	2m 14s
test-2_5 (pox-4-rosetta-btc-addr-types)	5m 13s
test-2_5 (pox-4-rosetta-cycle-phases)	1m 31s
test-2_5 (pox-4-rosetta-segwit)	1m 46s
test-2_5 (pox-4-burnchain-stack-stx)	1m 47s
test-2_5 (pox-4-burnchain-delegate-stx)	2m 20s
build-publish	1m 56s
	1h 6m 4s

Provide feedback