Update CM patches and begin rollout of patches w/ @phillipberndt's gps-fix included

The gps-fix hack has been applied for a very long time, end users will see
no difference. But the fix is now included in the services patches.

closes #177