#3372227: Drupal standard fixes.

Closes #3372227

Merge request reports

Loading