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

* commit 'ae5c0ad20c6e3cf1c71ad706b4f0800292867c21':