Reenable test and possibly make it less flaky.
Merge pull request #2923 from davidegrohmann/1.9-reenable-test

Reenable test and possibly make it less flaky
Merge remote-tracking branch 'upstream/1.9-maint' into 2.0-maint
Merge pull request #2936 from davidegrohmann/merge-1.9-into-2.0

Merge 1.9 into 2.0