Merge branch 'release-2.5' into release-2.5-bft #242

Job	Run time
Basic Checks	3m 48s
Unit Tests	6m 54s
Integration Tests (raft)	12m 52s
Integration Tests (e2e smartbft)	27m 59s
Integration Tests (pvtdata)	15m 45s
Integration Tests (discovery gossip devmode pluggable)	10m 42s
Integration Tests (pvtdatapurge)	4m 29s
Integration Tests (lifecycle)	11m 36s
Integration Tests (ledger)	15m 22s
Integration Tests (gateway idemix pkcs11 configtx configtxlator)	7m 23s
Integration Tests (sbe nwo msp)	9m 2s
	2h 5m 52s

Provide feedback