Merge "Switch virtual labs to Salt 2017.7"