am b14cf2eb: am e70d3877: Merge "manta: batching and timestamp issues"

* commit 'b14cf2eb3730efe4f7cf5946ece61ec6b611766f':
  manta: batching and timestamp issues