BZ-9921: Fix issue with estimateId not being set in the adornments of the notification
Merge branch 'master' of https://github.com/NoesisEnergy/bootstrap