Parameterizing queue_buffering_max_ms and batch_num_messages

Change-Id: I2181807d72e8dc9c2a99247b9bc739119704da62