Merge proposals dependent on lp://staging/~thomas-voss/location-service/fix-up-acceptance-tests

1. fix-up-acceptance-tests
2. Dependent merge proposals