Merge "Deprecate the skip_unless_attr decorator."