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

Job	Run time
Basic Checks	3m 55s
Unit Tests	6m 57s
Integration Tests (pvtdata)	15m 46s
Integration Tests (discovery gossip devmode pluggable)	11m 13s
Integration Tests (raft)	13m 24s
Integration Tests (e2e smartbft)	27m 23s
Integration Tests (gateway idemix pkcs11 configtx configtxlator)	7m 24s
Integration Tests (pvtdatapurge)	4m 38s
Integration Tests (lifecycle)	11m 51s
Integration Tests (ledger)	15m 21s
Integration Tests (sbe nwo msp)	9m 26s
	2h 7m 18s

Provide feedback