BZ-11409 upload progress
Merge branch 'master' of https://github.com/NoesisEnergy/bootstrap