Issue #3322723 backport

Andrii Podanenkorequested to merge
3.0.x into 7.x-2.x

Issue #2693297 Backport for drush 8 compatibility

Merge request reports