Fixing entity type and entity storage controller bugs related to the ever-shifting Core. [#2182441]
Replacing references to plugin.manager.entity to the entity.manager service. [#2182443]
Additional clean related to entity type cleanups from Core. [#2182441]
Further stabilization of unit tests per upstream Core changes. [#2182441]