am 7e8315c0: am b7f57f25: Remove STOPSHIP debug code

Merge commit '7e8315c018edd545cc7ed1ef560a03e623a71a5d' into kraken

* commit '7e8315c018edd545cc7ed1ef560a03e623a71a5d':
  Remove STOPSHIP debug code