Merge "Add compute_feature_enabled.attach_encrypted_volume config option"