More savanna fixes
Merge branch 'savanna_fixes' of https://github.com/dmitryilyin/fuel into dmitryilyin-savanna_fixes
use correct var for auto_assign_floating_ips
Merge pull request #651 from Mirantis/savanna_fixes

Savanna fixes