Clean up Drupal 7 leftovers, coding standards, and typos

J Prequested to merge
issue/customerror-3637956:3637956--clean-up into 8.x-1.x

Closes #3637956

Merge request reports