Merge change 25384 into eclair

* changes:
  Make bulkInsert yield if contented, s.t. other processes can access the contacts db if needed. This is a temp. fix until we figure out what is going on with the bulkInsert of presence - i.e., why are they taking so long.