Merge pull request #549 from metamx/fix-sink

fix race condition with merge and persist and sink adding