Merge proposals dependent on lp:~thomas-voss/location-service/do_not_bail_out_on_invalid_technology

1. do_not_bail_out_on_invalid_technology
2. Dependent merge proposals