Issue #2398689 by jeqq: Follow-up: Applying entity schema updates still fails when both field and entity type definitions changes