Merge proposals dependent on lp://staging/~thomas-voss/location-service/forward-command-line-parameters-to-providers

1. forward-command-line-parameters-to-providers
2. Dependent merge proposals