merge: cherry pick from develop #4055

Job	Run time
bridgechain-registration (16.x)	9m 46s
bridgechain-resignation (16.x)	8m 44s
bridgechain-update (16.x)	8m 57s
business-registration (16.x)	8m 30s
business-resignation (16.x)	10m 1s
business-update (16.x)	10m 25s
core-database (16.x)	4m 11s
delegate-registration (16.x)	7m 5s
delegate-resignation (16.x)	10m 33s
entity-register (16.x)	14m 58s
entity-resign (16.x)	16m 40s
entity-update (16.x)	16m 42s
htlc-claim (16.x)	7m 51s
htlc-lock (16.x)	7m 44s
htlc-refund (16.x)	8m 10s
ipfs (16.x)	7m 9s
multi-payment (16.x)	8m 47s
multi-signature-registration (16.x)	6m 18s
second-signature-registration (16.x)	5m 53s
transfer (16.x)	8m 23s
vote (16.x)	7m 43s
	3h 14m 30s

Provide feedback