[Merge] lp:~thomas-voss/location-service/inject-reference-time-from-ntp-server into lp:location-service/15.04

[Simon Fels]

Review: Approve

LGTM
-- 
https://code.launchpad.net/~thomas-voss/location-service/inject-reference-time-from-ntp-server/+merge/284012
Your team Ubuntu Phablet Team is subscribed to branch lp:location-service/15.04.