BZ-12032 ECM estimator issues
Merge branch 'ecmestimator' of https://github.com/NoesisEnergy/bootstrap into ecmestimator