Merge "Remove Salt deprecations and switch tests to Salt 2017.7"