Merge proposals dependent on lp://staging/~charlesk/indicator-location/lp-1533835-use-correct-url-for-system-settings

1. lp-1533835-use-correct-url-for-system-settings
2. Dependent merge proposals