Merge "Migrates Apex to virtual deployments to use new slave"