Merge "Increase tolreance value for testBatchAndFlush. Add more logging." into lmp-dev