Merge pull request #46 from Mirantis/salt_control

Salt control infra