8150969: DEFER from Features API is taking precedence over defer preference in catalog file

Reviewed-by: lancea
5 files changed