Merge "Deprecate logout token on GET"