Merge proposals dependent on lp://staging/~thomas-voss/location-service/make-confinement-strict-again

1. make-confinement-strict-again
2. Dependent merge proposals