Bring r28860 across to ensure num_local_peers is set for PMI2 and PMI1