BZ-11716: fix style issues
Merge branch 'ecmestimator' of https://github.com/NoesisEnergy/bootstrap into ecmestimator