BZ-9958: remove estimateId from the trakcpoint
Merge branch 'release-candidate' of https://github.com/NoesisEnergy/bootstrap into release-candidate