Merge peg/dont-mock-propagation, lower test reshare block number

Merge peg/dont-mock-propagation, lower test reshare block number #705