Resolve #3475741 "Fix phpcodesniffer issues"

And allow Drupal to do a sensible rearranging of, without changing, other field info.

Closes #3475741

Merge request reports

Loading