Merge "Remove deprecated compute config options for validation-2"