am a07f1f2d: Remove STOPSHIP and defer removal.

* commit 'a07f1f2d07832eaebe011f018cfbc643cf4a0dbd':
  Remove STOPSHIP and defer removal.
tree: 9efbe0e5dd288903d7fd7ee7e1cd67f7f884cacf
  1. core/
  2. services/