Merge "Don't reinstall python-virtualenv on infra nodes"