Merge proposals dependent on lp://staging/~thomas-voss/location-service/add-ichnaea-provider

1. add-ichnaea-provider
2. Dependent merge proposals