Merged changes

In particualr use num_keys for all incoming messages, num_records i
sused for bulk get to reflect the number of records retreived.