BGPCEP-578: Extended peer-group support