Merge changes I6c7454fb,Id739aca9

* changes:
  Extract common methods to abstract class (2/N)
  Extract snapshot persist thread from TaskSnapshotPersister(1/N)