Please cherry-pick r366985 into the 9.0 branch

[labath]

Bugzilla Link	42769
Resolution	FIXED
Resolved on	Jul 26, 2019 09:37
Version	9.0
OS	Linux
Blocks	#41819
CC	@JDevlieghere

[labath]

assigned to @zmodem

[labath]

The actual change is just a one-liner. The rest of the patch fiddles with the test...

[zmodem]

Merged in r367128.