Merge "Deprecate the identity-feature-enabled.reseller config option."