Issue #3498658: Update node edit forms so the fields are consistently ordered

Closes #3498658

Merge request reports

Loading