Merge change 6620 into donut

* changes:
  Keep Gears permissions in sync with system location settings.