Merge "Switch deployments to Salt 2017.7"