Merge pull request #1765 from erikvold/master

Bug 1115383 setting some prefs which use location.services.mozilla.com to dummy urls (only when no-connection prefs should be used) a=me