fix race condition with merge and persist and sink adding
fix for code review comments
fix another code review comment
Merge remote-tracking branch 'upstream/druid-0.6.105.x'