Merge "Remove tempest duplicate copy of skip_unless_attr"