Merge "BUG-1079: reorder fields within get-schema"