Issue #2542748 by plach: Follow-up to Automatic entity updates can fail when there is existing content, leaving the site's schema in an unpredictable state