[Merge] lp:~thomas-voss/location-service/cherry-pick into lp:location-service/15.04

[Thomas Voß]

Thomas Voß has proposed merging lp:~thomas-voss/location-service/cherry-pick into lp:location-service/15.04.

Commit message:
Cherry-pick rev. 196 and 199 from lp:location-service. The changes got accidentally removed by merging the outstanding documentation branch.

Requested reviews:
  Ubuntu Phablet Team (phablet-team)

For more details, see:
https://code.launchpad.net/~thomas-voss/location-service/cherry-pick/+merge/277055

Cherry-pick rev. 196 and 199 from lp:location-service. The changes got accidentally removed by merging the outstanding documentation branch.
-- 
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~thomas-voss/location-service/cherry-pick into lp:location-service/15.04.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 4420 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20151109/0d047dec/attachment.diff>