Resolve "DATABASE_TO_JSON_ERROR due to !1887 (unknown element in hosts-database/config-database: read-timeout and write-timeout)"
requested to merge 2741-database_to_json_error-due-to-1887-unknown-element-in-hosts-database-config-database-read into master