Merge "Revert "cloud-infra: Use sudo while operating on openrc""