Merge proposals dependent on lp://staging/~thomas-voss/location-service/enable-kml-reporting

1. enable-kml-reporting
2. Dependent merge proposals