[Merge] lp:~ssweeny/location-service/cleanups.15.04 into lp:location-service/15.04

[Scott Sweeny]

Scott Sweeny has proposed merging lp:~ssweeny/location-service/cleanups.15.04 into lp:location-service/15.04.

Commit message:
Small fixes around provider loading

Requested reviews:
  Thomas Voß (thomas-voss)

For more details, see:
https://code.launchpad.net/~ssweeny/location-service/cleanups.15.04/+merge/284676

A couple of small refactors previously discussed with tvoss:

 * provider loading loop
 * extracting undecorated provider names

Also, clear any stored daemon options before parsing new ones. They were persisting between test runs, which I believe invalidated the cli tests (happily with this fix they still pass).
-- 
Your team Ubuntu Phablet Team is subscribed to branch lp:location-service/15.04.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 10253 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20160201/2e2db18a/attachment.diff>