Fixed bug in entity_dao, when combining config info.
Removed "default_" prefix to default entity configs.