DS build: Revert only overridden features.

This PR is to avoid possible circular dependencies when reverting features.

#### What's this PR do?
- Makes DS script revert only features that are clearly overridden instead of reverting everything