Add 8.4 and 8.5.

Dave Longrequested to merge
issue/drupal-3569877:3569877-10.6.x into 10.6.x

Closes #3569877

Merge request reports