Add IgnoreSetupFeatures, IgnoreCleanupFeatures

Remove IgnoreSetupFeature and IgnoreCleanupFeature.

The new annotations causes a feature to ignore only
@SetupFeatures or @CleanupFeatures.
Merge branch 'master' into ignorefeatures
Merge branch 'ignorefeatures'