BZ-13096: test changes
Merge branch 'integration' of https://github.com/NoesisEnergy/bootstrap into integration