[feature/docker-integration]
fix debian os conflict bug
Merge branch 'feature/docker-integration' of github.com:MadeiraCloud/salt into feature/docker-integration