[Merge] lp:~thomas-voss/location-service/fix-nm-race into lp:location-service

[PS Jenkins bot]

Review: Needs Fixing continuous-integration

FAILED: Continuous integration, rev:149
http://jenkins.qa.ubuntu.com/job/location-service-ci/330/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/2/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/330/rebuild

-- 
https://code.launchpad.net/~thomas-voss/location-service/fix-nm-race/+merge/241090
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~thomas-voss/location-service/fix-nm-race into lp:location-service.