Moved changes to the 10.4.x branch from the 11.x branch.

Joe Suttarequested to merge
issue/drupal-2797583:2797583-10.4.x into 10.4.x

Closes #2797583

Merge request reports