Merge proposals dependent on lp://staging/~thomas-voss/location-service/adjust-documentation

1. adjust-documentation
2. Dependent merge proposals