Savanna refactoring
Merge pull request #592 from dmitryilyin/savanna_only

Savanna only without murano/heat merge request