Merge changes I6791dd72,I887d5073

* changes:
  Reduce priority of merge threads
  Tune snapshot-merge performance