Issue #1426804 by alexpott, swentel: Fixed Allow field storages to be persisted when they have no fields.

Issue #2287727 by yched, swentel, alexpott: Rename Field[instance]Config classes and entity types (again).