add new changes according to master branch
Merge branch 'preSF' of https://github.com/Mirantis/savanna into preSF