Merge "openrc: Stop setting OS_TENANT_NAME"