Move new field_ids to bottom.

Should hopefully fix the weird tile problems we have been having lately.
Merge partial field definition fix.
Reorder the rest of the field definitions.
Merge pull request #6066 from kevingranade/fix-field-order

Fix field order