2.5 exec go fix (#5407) #4539

Job	Run time
Basic Checks	2m 30s
Unit Tests	7m 39s
Integration Tests (pvtdatapurge)	5m 4s
Integration Tests (lifecycle)	12m 5s
Integration Tests (pvtdata)	16m 7s
Integration Tests (sbe nwo msp)	9m 28s
Integration Tests (e2e)	8m 21s
Integration Tests (raft)	14m 4s
Integration Tests (ledger)	16m 23s
Integration Tests (discovery gossip devmode pluggable)	11m 57s
Integration Tests (gateway idemix pkcs11 configtx configtxlator)	8m 14s
	1h 51m 52s

Provide feedback