added new changes for integr. tests
Merge branch 'preSF' of https://github.com/Mirantis/savanna into preSF