Merge "Refactor apt_mirantis/saltstack"