Fix ExtractorService after renaming ExtractorsResource#terminate
Revert "Fix ExtractorService after renaming ExtractorsResource#terminate"

This reverts commit 72a4655e3cc8347a48646173dc8f9e18589e2579.
Merge branch '0.90' into 0.91