BZ-8972: TrackpointService not working in bootstrap.
Merge branch 'master' of https://github.com/NoesisEnergy/bootstrap