reroll 2931500 against 7.98

florisgrequested to merge
issue/drupal-2931500:2931500- into 7.x

#20 is working for solr issue Closes #2931500

Merge request reports