Restore API for waitForImportFinished but mark as deprecated

Since the threaded indexing implementation was removed, this is
no longer needed.  However removing it changes the API and this
can break code that depends on the method being available.
Merge branch 'restore-waitForFinished'

* restore-waitForFinished:
  Restore API for waitForImportFinished but mark as deprecated