am cc4e84ee: Merge "Remove STOPSHIPs from GSA 4.0" into ub-now-porkchop

* commit 'cc4e84ee3bf5be23b30dc06c3c861391e92ed633':
  Remove STOPSHIPs from GSA 4.0