BZ-9958: Changes to support editing an existing estimate
Merge branch 'master' of https://github.com/NoesisEnergy/bootstrap