Issue #2086905 by japerry: update features module in concert with updating cosmetic feature overrides.